X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-status-script;h=947cc219752ce3f099ca182e32e684f09ab4c1db;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=e9a03834415e926e8f42df9c0f699204af51fec9;hpb=638ccfdf0eeabf3d985426308b2a82db6207ae28;p=git.git diff --git a/git-status-script b/git-status-script index e9a03834..947cc219 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