summaryrefslogtreecommitdiff
path: root/git-status-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-15 08:56:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-15 10:00:22 (GMT)
commit3998f8eba9f14efcb08468ecdbe2a69ed6da880d (patch)
treebb0010fb2b69c7479ecdb873e7c89d9cbcf4f390 /git-status-script
parent7c27558c6236225b07c5d5def76299d2b5fe7635 (diff)
downloadgit-3998f8eba9f14efcb08468ecdbe2a69ed6da880d.zip
git-3998f8eba9f14efcb08468ecdbe2a69ed6da880d.tar.gz
git-3998f8eba9f14efcb08468ecdbe2a69ed6da880d.tar.bz2
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>
Diffstat (limited to 'git-status-script')
-rwxr-xr-xgit-status-script10
1 files changed, 9 insertions, 1 deletions
diff --git a/git-status-script b/git-status-script
index e9a0383..947cc21 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