[PATCH] git bugfixes and cleanups, mainly Debian things

diff --git a/git-status-script b/git-status-script
index 72a93f74e8152417578f4c250852450a61bd8440..947cc219752ce3f099ca182e32e684f09ab4c1db 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:
@@ -13,21 +15,21 @@ report () {
     trailer="#
 "
     case "$status" in
-    M) echo "# modified: $name";;
-    D) echo "# deleted:  $name";;
-    T) echo "# typechange: $name";;
-    C) echo "# copied: $name -> $newname";;
-    R) echo "# renamed: $name -> $newname";;
-    N) echo "# new file: $name";;
-    U) echo "# unmerged: $name";;
+    M ) echo "#        modified: $name";;
+    D*) echo "#        deleted:  $name";;
+    T ) echo "#        typechange: $name";;
+    C*) echo "#        copied: $name -> $newname";;
+    R*) echo "#        renamed: $name -> $newname";;
+    A*) echo "#        new file: $name";;
+    U ) echo "#        unmerged: $name";;
     esac
   done
   echo -n "$trailer"
   [ "$header" ]
 }
 
-git-update-cache --refresh >& /dev/null
-git-diff-cache -B -C --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"
+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"
 if [ "$committable" == "0" ]
@@ -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