[PATCH] Updates to glossary

[git.git] / git-status-script

diff --git a/git-status-script b/git-status-script
index 7d47fde..947cc21 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:
@@ -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