From: Kalle Valo <Kalle.Valo@iki.fi>
Date: Tue, 16 Aug 2005 17:58:10 +0000 (+0300)
Subject: [PATCH] Change git-branch to list branches
X-Git-Tag: v0.99.5~16^2~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e4aec26f8068100ae7b496b904d013943626d8c2;p=git.git

[PATCH] Change git-branch to list branches

If no argument provided to `git branch`, show available branches and
mark current branch with star.

This is based on patch written by Amos Waterland <apw@rossby.metr.ou.edu>.

[jc: and I changed it to handle subdirectories under refs/heads/ as well.]

Signed-off-by: Kalle Valo <Kalle.Valo@iki.fi>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-branch-script b/git-branch-script
index 041ca515a..a6dfeaf55 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"