mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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)
This commit is contained in:
parent
9804b7dc19
commit
ba966b9579
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue