Show which branch you are on in git-status output.

When not on the "master" branch, show which branch we are
working on in the git-status message.

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

diff --git a/git-status-script b/git-status-script
index e9a03834415e926e8f42df9c0f699204af51fec9..947cc219752ce3f099ca182e32e684f09ab4c1db 100755 (executable)
--- a/git-status-script
+++ b/git-status-script
@@ -1,4 +1,6 @@
 #!/bin/sh
+. git-sh-setup-script || die "Not a git archive"
+
 report () {
   header="#
 # $1:
@@ -26,7 +28,7 @@ report () {
   [ "$header" ]
 }
 
-git-update-cache --refresh >& /dev/null
+git-update-cache --refresh >/dev/null 2>&1
 git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"
 committable="$?"
 git-diff-files | sed 's/^://' | report "Changed but not updated" "use git-update-cache to mark for commit"
@@ -35,4 +37,10 @@ then
        echo "nothing to commit"
        exit 1
 fi
+branch=`readlink "$GIT_DIR/HEAD"`
+case "$branch" in
+refs/heads/master) ;;
+*)     echo "#
+# On branch $branch" ;;
+esac
 exit 0