mirror of
https://github.com/git/git
synced 2024-09-13 13:24:41 +00:00
ba966b9579
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)
74 lines
1.3 KiB
Bash
Executable file
74 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Linus Torvalds
|
|
#
|
|
. git-sh-setup-script || die "Not a git archive"
|
|
|
|
report () {
|
|
header="#
|
|
# $1:
|
|
# ($2)
|
|
#
|
|
"
|
|
trailer=""
|
|
while read oldmode mode oldsha sha status name newname
|
|
do
|
|
echo -n "$header"
|
|
header=""
|
|
trailer="#
|
|
"
|
|
case "$status" in
|
|
M ) echo "# modified: $name";;
|
|
D*) echo "# deleted: $name";;
|
|
T ) echo "# typechange: $name";;
|
|
C*) echo "# copied: $name -> $newname";;
|
|
R*) echo "# renamed: $name -> $newname";;
|
|
A*) echo "# new file: $name";;
|
|
U ) echo "# unmerged: $name";;
|
|
esac
|
|
done
|
|
echo -n "$trailer"
|
|
[ "$header" ]
|
|
}
|
|
|
|
branch=`readlink "$GIT_DIR/HEAD"`
|
|
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"
|
|
|
|
committable="$?"
|
|
|
|
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"
|
|
exit 1
|
|
fi
|
|
exit 0
|