diff --git a/git-status.sh b/git-status.sh
index 29c2b1169b5f8ee862cbc62d0a1eb5577587e1c1..10d781c92f82197845ce30c67f796d99379e93cd 100755 (executable)
--- a/git-status.sh
+++ b/git-status.sh
#
# 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="#
trailer=""
while read status name newname
do
- echo -n "$header"
+ printf '%s' "$header"
header=""
trailer="#
"
U ) echo "# unmerged: $name";;
esac
done
- echo -n "$trailer"
+ printf '%s' "$trailer"
[ "$header" ]
}
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
if test -f "$GIT_DIR/info/exclude"
then
- git-ls-files -z --others \
+ git-ls-files -z --others --directory \
--exclude-from="$GIT_DIR/info/exclude" \
--exclude-per-directory=.gitignore
else
- git-ls-files -z --others \
+ git-ls-files -z --others --directory \
--exclude-per-directory=.gitignore
fi |
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;
}