undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More useful/hinting error messages in git-checkout

Browse Source 
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Josef Weidendorfer 2006-02-15 20:22:11 +01:00 committed by Junio C Hamano
parent 6c5c62f340
commit babfaf8dee
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
git-checkout.sh
View File

@ -22,7 +22,7 @@ while [ "$#" != "0" ]; do
[ -e "$GIT_DIR/refs/heads/$newbranch" ] && [ -e "$GIT_DIR/refs/heads/$newbranch" ] &&
die "git checkout: branch $newbranch already exists" die "git checkout: branch $newbranch already exists"
git-check-ref-format "heads/$newbranch" || git-check-ref-format "heads/$newbranch" ||
die "we do not like '$newbranch' as a branch name." die "git checkout: we do not like '$newbranch' as a branch name."
;; ;;
"-f") "-f")
force=1 force=1
@ -75,9 +75,15 @@ done
if test "$#" -ge 1 if test "$#" -ge 1
then then
hint=
if test "$#" -eq 1
then
hint="
Did you intend to checkout '$@' which can not be resolved as commit?"
fi
if test '' != "$newbranch$force$merge" if test '' != "$newbranch$force$merge"
then then
die "updating paths and switching branches or forcing are incompatible." die "git checkout: updating paths is incompatible with switching branches/forcing$hint"
fi fi
if test '' != "$new" if test '' != "$new"
then then
@ -117,7 +123,8 @@ fi
[ -z "$branch$newbranch" ] && [ -z "$branch$newbranch" ] &&
[ "$new" != "$old" ] && [ "$new" != "$old" ] &&
die "git checkout: you need to specify a new branch name" die "git checkout: to checkout the requested commit you need to specify
a name for a new branch which is created and switched to"
if [ "$force" ] if [ "$force" ]
then then