Merge changes from master.

1 files changed, 20 insertions, 5 deletions

diff --git a/git-branch-script b/git-branch-script
index 041ca515ae..a6dfeaf55f 100755
--- a/git-branch-script
+++ b/git-branch-script
@@ -2,16 +2,31 @@
 
 . git-sh-setup-script || die "Not a git archive"
 
-branchname="$1"
-case "$2" in
-'')
+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 --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"