summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-26 09:12:50 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-28 19:15:10 (GMT)
commitba966b957908248396402acd785d10ba1da07294 (patch)
treeacae08c161de728bf10fb5bdaeece268b8df2180
parent9804b7dc1974d59d4d37c37ba4624bb835456207 (diff)
downloadgit-ba966b957908248396402acd785d10ba1da07294.zip
git-ba966b957908248396402acd785d10ba1da07294.tar.gz
git-ba966b957908248396402acd785d10ba1da07294.tar.bz2
Teach git-status-script about git-ls-files --others
When there is non-empty $GIT_DIR/info/exclude file, use it along with .gitignore per-directory exclude pattern files (which was a convention agreed on the list while ago and is compatible with Cogito) to generate a list of ignored files as well. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from d330948a5ff0df55c2f12627c0583b4e16f1ea4d commit)
-rwxr-xr-xgit-status-script32
1 files changed, 30 insertions, 2 deletions
diff --git a/git-status-script b/git-status-script
index 1999a66..1696f23 100755
--- a/git-status-script
+++ b/git-status-script
@@ -1,4 +1,7 @@
#!/bin/sh
+#
+# Copyright (c) 2005 Linus Torvalds
+#
. git-sh-setup-script || die "Not a git archive"
report () {
@@ -33,10 +36,35 @@ 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"
+
+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"