[PATCH] Teach git-status-script about git-ls-files --others
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- git-status-script | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) 5444043b5f5a2464938acd6da9408ec55ca40249
diff --git a/git-status-script b/git-status-script
--- 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"