Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

diff --git a/git-status-script b/git-status-script
index f91bb55894a07f3ebca9031f2fa2ba2ef8789ffd..1696f23e04a1b96234c60ae07306fdd94d0da314 100755 (executable)
--- a/git-status-script
+++ b/git-status-script
@@ -1,4 +1,9 @@
 #!/bin/sh
+#
+# Copyright (c) 2005 Linus Torvalds
+#
+. git-sh-setup-script || die "Not a git archive"
+
 report () {
   header="#
 # $1:
@@ -18,7 +23,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,10 +31,40 @@ report () {
   [ "$header" ]
 }
 
-git-update-cache --refresh >& /dev/null
-git-diff-cache -B -C --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"
+branch=`readlink "$GIT_DIR/HEAD"`
+case "$branch" in
+refs/heads/master) ;;
+*)     echo "# On branch $branch" ;;
+esac
+
+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"
+
+git-diff-files |
+sed 's/^://' |
+report "Changed but not updated" "use git-update-cache to mark for commit"
+
+if grep -v '^#' "$GIT_DIR/info/exclude" >/dev/null 2>&1
+then
+       git-ls-files --others \
+           --exclude-from="$GIT_DIR/info/exclude" \
+           --exclude-per-directory=.gitignore |
+       sed -e '
+       1i\
+#\
+# Ignored files:\
+#   (use "git add" to add to commit)\
+#
+       s/^/#   /
+       $a\
+#'
+fi
+
 if [ "$committable" == "0" ]
 then
        echo "nothing to commit"