X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-status-script;h=947cc219752ce3f099ca182e32e684f09ab4c1db;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=7d47fdea79aafaab1d6357d8ce478e2fb40b45b0;hpb=753fd78458b6d7d0e65ce0ebe7b62e1bc55f3992;p=git.git

diff --git a/git-status-script b/git-status-script
index 7d47fdea..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:
@@ -18,7 +20,7 @@ report () {
     T ) echo "#	typechange: $name";;
     C*) echo "#	copied: $name -> $newname";;
     R*) echo "#	renamed: $name -> $newname";;
-    N*) echo "#	new file: $name";;
+    A*) echo "#	new file: $name";;
     U ) echo "#	unmerged: $name";;
     esac
   done
@@ -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