* [PATCH] git-branch: avoid getting confused by empty or nonexisting branches.
@ 2005-07-23 2:08 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2005-07-23 2:08 UTC (permalink / raw)
To: Linus Torvalds; +Cc: git
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>
---
git-branch-script | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
baf3c4ffceae925d836f19382611968699414cd6
diff --git a/git-branch-script b/git-branch-script
--- 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"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-07-23 2:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-07-23 2:08 [PATCH] git-branch: avoid getting confused by empty or nonexisting branches Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox