Merge fixes up to GIT 1.0.4

diff --git a/git-status.sh b/git-status.sh
index 29c2b1169b5f8ee862cbc62d0a1eb5577587e1c1..50ccd24efb707d615e560dfbd38abec5b2b25b20 100755 (executable)
--- a/git-status.sh
+++ b/git-status.sh
@@ -2,7 +2,16 @@
 #
 # Copyright (c) 2005 Linus Torvalds
 #
-. git-sh-setup || die "Not a git archive"
+
+USAGE=''
+SUBDIRECTORY_OK='Yes'
+
+. git-sh-setup
+
+if [ "$#" != "0" ]
+then
+  usage
+fi
 
 report () {
   header="#
@@ -13,7 +22,7 @@ report () {
   trailer=""
   while read status name newname
   do
-    echo -n "$header"
+    printf '%s' "$header"
     header=""
     trailer="#
 "
@@ -27,7 +36,7 @@ report () {
     U ) echo "#        unmerged: $name";;
     esac
   done
-  echo -n "$trailer"
+  printf '%s' "$trailer"
   [ "$header" ]
 }
 
@@ -41,7 +50,7 @@ git-update-index -q --unmerged --refresh || exit
 
 if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1
 then
-       git-diff-index -M --cached --name-status HEAD |
+       git-diff-index -M --cached --name-status --diff-filter=MDTCRA HEAD |
        sed -e '
                s/\\/\\\\/g
                s/ /\\ /g
@@ -90,7 +99,7 @@ perl -e '$/ = "\0";
                s|\n|\\n|g;
                s/^/#   /;
                if (!$shown) {
-                       print "#\n# Ignored files:\n";
+                       print "#\n# Untracked files:\n";
                        print "#   (use \"git add\" to add to commit)\n#\n";
                        $shown = 1;
                }