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:
@ -1,4 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
#
|
||||||
|
# Copyright (c) 2005 Linus Torvalds
|
||||||
|
#
|
||||||
. git-sh-setup-script || die "Not a git archive"
|
. git-sh-setup-script || die "Not a git archive"
|
||||||
|
|
||||||
report () {
|
report () {
|
||||||
@ -33,10 +36,35 @@ case "$branch" in
|
|||||||
refs/heads/master) ;;
|
refs/heads/master) ;;
|
||||||
*) echo "# On branch $branch" ;;
|
*) echo "# On branch $branch" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
git-update-cache --refresh >/dev/null 2>&1
|
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="$?"
|
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" ]
|
if [ "$committable" == "0" ]
|
||||||
then
|
then
|
||||||
echo "nothing to commit"
|
echo "nothing to commit"
|
||||||
|
Reference in New Issue
Block a user