X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-branch-script;h=a6dfeaf55fb917de346132a94e9d3d123223eecd;hb=90a734dc7f37a7bd1f3beec4d33acad559360f6c;hp=ade0abf06987bdb78ede571de7afe927486a2c69;hpb=98e031f0bb6e857c684e6db24d03d22cfc1a532a;p=git.git

diff --git a/git-branch-script b/git-branch-script
index ade0abf0..a6dfeaf5 100755
--- a/git-branch-script
+++ b/git-branch-script
@@ -2,10 +2,31 @@
 
 . git-sh-setup-script || die "Not a git archive"
 
+case "$#" in
+0)
+	headref=$(readlink "$GIT_DIR/HEAD" | sed -e 's|^refs/heads/||')
+	git-rev-parse --symbolic --all |
+	sed -ne 's|^refs/heads/||p' |
+	sort |
+	while read ref
+	do
+		if test "$headref" = "$ref"
+		then
+			pfx='*'
+		else
+			pfx=' '
+		fi
+		echo "$pfx $ref"
+	done
+	exit 0 ;;
+1)
+	head=HEAD ;;
+2)
+	head="$2^0" ;;
+esac
 branchname="$1"
-rev=$(git-rev-parse --verify --default HEAD "$2"^0) || exit
+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"
 
 echo $rev > "$GIT_DIR/refs/heads/$branchname"