From: Junio C Hamano Date: Mon, 15 Aug 2005 08:56:23 +0000 (-0700) Subject: Show which branch you are on in git-status output. X-Git-Tag: v0.99.5~21^2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3998f8eba9f14efcb08468ecdbe2a69ed6da880d;p=git.git 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 --- diff --git a/git-status-script b/git-status-script index e9a038344..947cc2197 100755 --- 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