[PATCH] git-branch: avoid getting confused by empty or nonexisting branches.

When not specifying the start point explicitly, we ended up
emitting ^0 in addition to the default HEAD.  Be careful to see
if we have "$2" before finding out which commit to base the new
branch on.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-branch-script b/git-branch-script
index ade0abf06987bdb78ede571de7afe927486a2c69..041ca515ae700252ca03ea928b544be6bcdeab9c 100755 (executable)
--- a/git-branch-script
+++ b/git-branch-script
@@ -3,7 +3,13 @@
 . git-sh-setup-script || die "Not a git archive"
 
 branchname="$1"
-rev=$(git-rev-parse --verify --default HEAD "$2"^0) || exit
+case "$2" in
+'')
+       head=HEAD ;;
+*)
+       head="$2^0" ;;
+esac
+rev=$(git-rev-parse --revs-only --verify "$head") || exit
 
 [ -z "$branchname" ] && die "git branch: I want a branch name"
 [ -e "$GIT_DIR/refs/heads/$branchname" ] && die "$branchname already exists"