2013-01-06 17:58:13 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description=check-ignore
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
init_vars () {
|
2016-01-27 17:20:03 +01:00
|
|
|
global_excludes="global-excludes"
|
2013-01-06 17:58:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enable_global_excludes () {
|
|
|
|
|
init_vars &&
|
|
|
|
|
git config core.excludesfile "$global_excludes"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
expect_in () {
|
|
|
|
|
dest="$HOME/expected-$1" text="$2"
|
|
|
|
|
if test -z "$text"
|
|
|
|
|
then
|
|
|
|
|
>"$dest" # avoid newline
|
|
|
|
|
else
|
|
|
|
|
echo "$text" >"$dest"
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
expect () {
|
|
|
|
|
expect_in stdout "$1"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
expect_from_stdin () {
|
|
|
|
|
cat >"$HOME/expected-stdout"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_stderr () {
|
|
|
|
|
expected="$1"
|
|
|
|
|
expect_in stderr "$1" &&
|
2021-02-11 02:53:53 +01:00
|
|
|
test_cmp "$HOME/expected-stderr" "$HOME/stderr"
|
2013-01-06 17:58:13 +01:00
|
|
|
}
|
|
|
|
|
|
2013-10-28 22:43:00 +01:00
|
|
|
broken_c_unquote () {
|
|
|
|
|
"$PERL_PATH" -pe 's/^"//; s/\\//; s/"$//; tr/\n/\0/' "$@"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
broken_c_unquote_verbose () {
|
|
|
|
|
"$PERL_PATH" -pe 's/ "/ /; s/\\//; s/"$//; tr/:\t\n/\0/' "$@"
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-06 17:58:13 +01:00
|
|
|
stderr_contains () {
|
|
|
|
|
regexp="$1"
|
2016-06-17 22:21:07 +02:00
|
|
|
if test_i18ngrep "$regexp" "$HOME/stderr"
|
2013-01-06 17:58:13 +01:00
|
|
|
then
|
|
|
|
|
return 0
|
|
|
|
|
else
|
|
|
|
|
echo "didn't find /$regexp/ in $HOME/stderr"
|
|
|
|
|
cat "$HOME/stderr"
|
|
|
|
|
return 1
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
stderr_empty_on_success () {
|
|
|
|
|
expect_code="$1"
|
|
|
|
|
if test $expect_code = 0
|
|
|
|
|
then
|
|
|
|
|
test_stderr ""
|
|
|
|
|
else
|
|
|
|
|
# If we expect failure then stderr might or might not be empty
|
|
|
|
|
# due to --quiet - the caller can check its contents
|
|
|
|
|
return 0
|
|
|
|
|
fi
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_check_ignore () {
|
|
|
|
|
args="$1" expect_code="${2:-0}" global_args="$3"
|
|
|
|
|
|
|
|
|
|
init_vars &&
|
|
|
|
|
rm -f "$HOME/stdout" "$HOME/stderr" "$HOME/cmd" &&
|
2013-09-05 18:08:01 +02:00
|
|
|
echo git $global_args check-ignore $quiet_opt $verbose_opt $non_matching_opt $no_index_opt $args \
|
2013-01-06 17:58:13 +01:00
|
|
|
>"$HOME/cmd" &&
|
2013-04-11 14:05:10 +02:00
|
|
|
echo "$expect_code" >"$HOME/expected-exit-code" &&
|
2013-01-06 17:58:13 +01:00
|
|
|
test_expect_code "$expect_code" \
|
2013-09-05 18:08:01 +02:00
|
|
|
git $global_args check-ignore $quiet_opt $verbose_opt $non_matching_opt $no_index_opt $args \
|
2013-01-06 17:58:13 +01:00
|
|
|
>"$HOME/stdout" 2>"$HOME/stderr" &&
|
|
|
|
|
test_cmp "$HOME/expected-stdout" "$HOME/stdout" &&
|
|
|
|
|
stderr_empty_on_success "$expect_code"
|
|
|
|
|
}
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
# Runs the same code with 4 different levels of output verbosity:
|
|
|
|
|
#
|
|
|
|
|
# 1. with -q / --quiet
|
|
|
|
|
# 2. with default verbosity
|
|
|
|
|
# 3. with -v / --verbose
|
|
|
|
|
# 4. with -v / --verbose, *and* -n / --non-matching
|
|
|
|
|
#
|
2013-02-19 15:06:22 +01:00
|
|
|
# expecting success each time. Takes advantage of the fact that
|
|
|
|
|
# check-ignore --verbose output is the same as normal output except
|
|
|
|
|
# for the extra first column.
|
|
|
|
|
#
|
2013-09-05 18:08:01 +02:00
|
|
|
# A parameter is used to determine if the tests are run with the
|
|
|
|
|
# normal case (using the index), or with the --no-index option.
|
|
|
|
|
#
|
2013-02-19 15:06:22 +01:00
|
|
|
# Arguments:
|
|
|
|
|
# - (optional) prereqs for this test, e.g. 'SYMLINKS'
|
|
|
|
|
# - test name
|
2013-04-11 14:05:10 +02:00
|
|
|
# - output to expect from the fourth verbosity mode (the output
|
|
|
|
|
# from the other verbosity modes is automatically inferred
|
|
|
|
|
# from this value)
|
2013-02-19 15:06:22 +01:00
|
|
|
# - code to run (should invoke test_check_ignore)
|
2013-09-05 18:08:01 +02:00
|
|
|
# - index option: --index or --no-index
|
|
|
|
|
test_expect_success_multiple () {
|
2013-01-06 17:58:13 +01:00
|
|
|
prereq=
|
2013-09-05 18:08:01 +02:00
|
|
|
if test $# -eq 5
|
2013-01-06 17:58:13 +01:00
|
|
|
then
|
|
|
|
|
prereq=$1
|
|
|
|
|
shift
|
|
|
|
|
fi
|
2013-09-05 18:08:01 +02:00
|
|
|
if test "$4" = "--index"
|
|
|
|
|
then
|
|
|
|
|
no_index_opt=
|
|
|
|
|
else
|
|
|
|
|
no_index_opt=$4
|
|
|
|
|
fi
|
2013-04-11 14:05:10 +02:00
|
|
|
testname="$1" expect_all="$2" code="$3"
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
expect_verbose=$( echo "$expect_all" | grep -v '^:: ' )
|
2013-01-06 17:58:13 +01:00
|
|
|
expect=$( echo "$expect_verbose" | sed -e 's/.* //' )
|
|
|
|
|
|
2013-09-05 18:08:01 +02:00
|
|
|
test_expect_success $prereq "$testname${no_index_opt:+ with $no_index_opt}" '
|
2013-01-06 17:58:13 +01:00
|
|
|
expect "$expect" &&
|
|
|
|
|
eval "$code"
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
# --quiet is only valid when a single pattern is passed
|
|
|
|
|
if test $( echo "$expect_all" | wc -l ) = 1
|
|
|
|
|
then
|
|
|
|
|
for quiet_opt in '-q' '--quiet'
|
|
|
|
|
do
|
2013-09-05 18:08:01 +02:00
|
|
|
opts="${no_index_opt:+$no_index_opt }$quiet_opt"
|
|
|
|
|
test_expect_success $prereq "$testname${opts:+ with $opts}" "
|
2013-01-06 17:58:13 +01:00
|
|
|
expect '' &&
|
|
|
|
|
$code
|
|
|
|
|
"
|
2013-04-11 14:05:10 +02:00
|
|
|
done
|
|
|
|
|
quiet_opt=
|
|
|
|
|
fi
|
2013-01-06 17:58:13 +01:00
|
|
|
|
|
|
|
|
for verbose_opt in '-v' '--verbose'
|
|
|
|
|
do
|
2013-09-05 18:08:01 +02:00
|
|
|
for non_matching_opt in '' '-n' '--non-matching'
|
2013-04-11 14:05:10 +02:00
|
|
|
do
|
|
|
|
|
if test -n "$non_matching_opt"
|
|
|
|
|
then
|
|
|
|
|
my_expect="$expect_all"
|
|
|
|
|
else
|
|
|
|
|
my_expect="$expect_verbose"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
test_code="
|
|
|
|
|
expect '$my_expect' &&
|
|
|
|
|
$code
|
|
|
|
|
"
|
2013-09-05 18:08:01 +02:00
|
|
|
opts="${no_index_opt:+$no_index_opt }$verbose_opt${non_matching_opt:+ $non_matching_opt}"
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success $prereq "$testname${opts:+ with $opts}" "$test_code"
|
|
|
|
|
done
|
2013-01-06 17:58:13 +01:00
|
|
|
done
|
|
|
|
|
verbose_opt=
|
2013-04-11 14:05:10 +02:00
|
|
|
non_matching_opt=
|
2013-09-05 18:08:01 +02:00
|
|
|
no_index_opt=
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi () {
|
|
|
|
|
test_expect_success_multiple "$@" "--index"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success_no_index_multi () {
|
|
|
|
|
test_expect_success_multiple "$@" "--no-index"
|
2013-01-06 17:58:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
|
init_vars &&
|
|
|
|
|
mkdir -p a/b/ignored-dir a/submodule b &&
|
|
|
|
|
if test_have_prereq SYMLINKS
|
|
|
|
|
then
|
|
|
|
|
ln -s b a/symlink
|
|
|
|
|
fi &&
|
|
|
|
|
(
|
|
|
|
|
cd a/submodule &&
|
|
|
|
|
git init &&
|
|
|
|
|
echo a >a &&
|
|
|
|
|
git add a &&
|
|
|
|
|
git commit -m"commit in submodule"
|
|
|
|
|
) &&
|
|
|
|
|
git add a/submodule &&
|
|
|
|
|
cat <<-\EOF >.gitignore &&
|
|
|
|
|
one
|
|
|
|
|
ignored-*
|
2013-02-19 20:56:44 +01:00
|
|
|
top-level-dir/
|
2013-01-06 17:58:13 +01:00
|
|
|
EOF
|
2013-01-10 22:24:52 +01:00
|
|
|
for dir in . a
|
|
|
|
|
do
|
|
|
|
|
: >$dir/not-ignored &&
|
|
|
|
|
: >$dir/ignored-and-untracked &&
|
|
|
|
|
: >$dir/ignored-but-in-index
|
|
|
|
|
done &&
|
|
|
|
|
git add -f ignored-but-in-index a/ignored-but-in-index &&
|
2013-01-06 17:58:13 +01:00
|
|
|
cat <<-\EOF >a/.gitignore &&
|
|
|
|
|
two*
|
|
|
|
|
*three
|
|
|
|
|
EOF
|
|
|
|
|
cat <<-\EOF >a/b/.gitignore &&
|
|
|
|
|
four
|
|
|
|
|
five
|
|
|
|
|
# this comment should affect the line numbers
|
|
|
|
|
six
|
|
|
|
|
ignored-dir/
|
|
|
|
|
# and so should this blank line:
|
|
|
|
|
|
|
|
|
|
!on*
|
|
|
|
|
!two
|
|
|
|
|
EOF
|
|
|
|
|
echo "seven" >a/b/ignored-dir/.gitignore &&
|
|
|
|
|
test -n "$HOME" &&
|
|
|
|
|
cat <<-\EOF >"$global_excludes" &&
|
|
|
|
|
globalone
|
|
|
|
|
!globaltwo
|
|
|
|
|
globalthree
|
|
|
|
|
EOF
|
|
|
|
|
cat <<-\EOF >>.git/info/exclude
|
|
|
|
|
per-repo
|
|
|
|
|
EOF
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test invalid inputs
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success_multi '. corner-case' ':: .' '
|
2013-02-19 20:56:44 +01:00
|
|
|
test_check_ignore . 1
|
|
|
|
|
'
|
|
|
|
|
|
2013-01-06 17:58:13 +01:00
|
|
|
test_expect_success_multi 'empty command line' '' '
|
|
|
|
|
test_check_ignore "" 128 &&
|
|
|
|
|
stderr_contains "fatal: no path specified"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi '--stdin with empty STDIN' '' '
|
|
|
|
|
test_check_ignore "--stdin" 1 </dev/null &&
|
2013-04-11 14:05:12 +02:00
|
|
|
test_stderr ""
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '-q with multiple args' '
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore "-q one two" 128 &&
|
|
|
|
|
stderr_contains "fatal: --quiet is only valid with a single pathname"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--quiet with multiple args' '
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore "--quiet one two" 128 &&
|
|
|
|
|
stderr_contains "fatal: --quiet is only valid with a single pathname"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
for verbose_opt in '-v' '--verbose'
|
|
|
|
|
do
|
|
|
|
|
for quiet_opt in '-q' '--quiet'
|
|
|
|
|
do
|
|
|
|
|
test_expect_success "$quiet_opt $verbose_opt" "
|
|
|
|
|
expect '' &&
|
|
|
|
|
test_check_ignore '$quiet_opt $verbose_opt foo' 128 &&
|
|
|
|
|
stderr_contains 'fatal: cannot have both --quiet and --verbose'
|
|
|
|
|
"
|
|
|
|
|
done
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
test_expect_success '--quiet with multiple args' '
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore "--quiet one two" 128 &&
|
|
|
|
|
stderr_contains "fatal: --quiet is only valid with a single pathname"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi 'erroneous use of --' '' '
|
|
|
|
|
test_check_ignore "--" 128 &&
|
|
|
|
|
stderr_contains "fatal: no path specified"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi '--stdin with superfluous arg' '' '
|
|
|
|
|
test_check_ignore "--stdin foo" 128 &&
|
|
|
|
|
stderr_contains "fatal: cannot specify pathnames with --stdin"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi '--stdin -z with superfluous arg' '' '
|
|
|
|
|
test_check_ignore "--stdin -z foo" 128 &&
|
|
|
|
|
stderr_contains "fatal: cannot specify pathnames with --stdin"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi '-z without --stdin' '' '
|
|
|
|
|
test_check_ignore "-z" 128 &&
|
|
|
|
|
stderr_contains "fatal: -z only makes sense with --stdin"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi '-z without --stdin and superfluous arg' '' '
|
|
|
|
|
test_check_ignore "-z foo" 128 &&
|
|
|
|
|
stderr_contains "fatal: -z only makes sense with --stdin"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi 'needs work tree' '' '
|
|
|
|
|
(
|
|
|
|
|
cd .git &&
|
|
|
|
|
test_check_ignore "foo" 128
|
|
|
|
|
) &&
|
2018-02-13 14:19:15 +01:00
|
|
|
stderr_contains "fatal: this operation must be run in a work tree"
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test standard ignores
|
|
|
|
|
|
|
|
|
|
# First make sure that the presence of a file in the working tree
|
|
|
|
|
# does not impact results, but that the presence of a file in the
|
2013-09-05 18:08:01 +02:00
|
|
|
# index does unless the --no-index option is used.
|
2013-01-06 17:58:13 +01:00
|
|
|
|
|
|
|
|
for subdir in '' 'a/'
|
|
|
|
|
do
|
|
|
|
|
if test -z "$subdir"
|
|
|
|
|
then
|
|
|
|
|
where="at top-level"
|
|
|
|
|
else
|
|
|
|
|
where="in subdir $subdir"
|
|
|
|
|
fi
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success_multi "non-existent file $where not ignored" \
|
|
|
|
|
":: ${subdir}non-existent" \
|
|
|
|
|
"test_check_ignore '${subdir}non-existent' 1"
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2013-09-05 18:08:01 +02:00
|
|
|
test_expect_success_no_index_multi "non-existent file $where not ignored" \
|
|
|
|
|
":: ${subdir}non-existent" \
|
|
|
|
|
"test_check_ignore '${subdir}non-existent' 1"
|
|
|
|
|
|
2013-01-06 17:58:13 +01:00
|
|
|
test_expect_success_multi "non-existent file $where ignored" \
|
2013-04-11 14:05:10 +02:00
|
|
|
".gitignore:1:one ${subdir}one" \
|
|
|
|
|
"test_check_ignore '${subdir}one'"
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2013-09-05 18:08:01 +02:00
|
|
|
test_expect_success_no_index_multi "non-existent file $where ignored" \
|
|
|
|
|
".gitignore:1:one ${subdir}one" \
|
|
|
|
|
"test_check_ignore '${subdir}one'"
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success_multi "existing untracked file $where not ignored" \
|
|
|
|
|
":: ${subdir}not-ignored" \
|
|
|
|
|
"test_check_ignore '${subdir}not-ignored' 1"
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2013-09-05 18:08:01 +02:00
|
|
|
test_expect_success_no_index_multi "existing untracked file $where not ignored" \
|
|
|
|
|
":: ${subdir}not-ignored" \
|
|
|
|
|
"test_check_ignore '${subdir}not-ignored' 1"
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success_multi "existing tracked file $where not ignored" \
|
|
|
|
|
":: ${subdir}ignored-but-in-index" \
|
|
|
|
|
"test_check_ignore '${subdir}ignored-but-in-index' 1"
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2013-09-05 18:08:01 +02:00
|
|
|
test_expect_success_no_index_multi "existing tracked file $where shown as ignored" \
|
|
|
|
|
".gitignore:2:ignored-* ${subdir}ignored-but-in-index" \
|
|
|
|
|
"test_check_ignore '${subdir}ignored-but-in-index'"
|
|
|
|
|
|
2013-01-06 17:58:13 +01:00
|
|
|
test_expect_success_multi "existing untracked file $where ignored" \
|
2013-04-11 14:05:10 +02:00
|
|
|
".gitignore:2:ignored-* ${subdir}ignored-and-untracked" \
|
|
|
|
|
"test_check_ignore '${subdir}ignored-and-untracked'"
|
|
|
|
|
|
2013-09-05 18:08:01 +02:00
|
|
|
test_expect_success_no_index_multi "existing untracked file $where ignored" \
|
|
|
|
|
".gitignore:2:ignored-* ${subdir}ignored-and-untracked" \
|
|
|
|
|
"test_check_ignore '${subdir}ignored-and-untracked'"
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success_multi "mix of file types $where" \
|
|
|
|
|
":: ${subdir}non-existent
|
|
|
|
|
.gitignore:1:one ${subdir}one
|
|
|
|
|
:: ${subdir}not-ignored
|
|
|
|
|
:: ${subdir}ignored-but-in-index
|
2013-09-05 18:08:01 +02:00
|
|
|
.gitignore:2:ignored-* ${subdir}ignored-and-untracked" \
|
|
|
|
|
"test_check_ignore '
|
|
|
|
|
${subdir}non-existent
|
|
|
|
|
${subdir}one
|
|
|
|
|
${subdir}not-ignored
|
|
|
|
|
${subdir}ignored-but-in-index
|
|
|
|
|
${subdir}ignored-and-untracked'
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
test_expect_success_no_index_multi "mix of file types $where" \
|
|
|
|
|
":: ${subdir}non-existent
|
|
|
|
|
.gitignore:1:one ${subdir}one
|
|
|
|
|
:: ${subdir}not-ignored
|
|
|
|
|
.gitignore:2:ignored-* ${subdir}ignored-but-in-index
|
2013-04-11 14:05:10 +02:00
|
|
|
.gitignore:2:ignored-* ${subdir}ignored-and-untracked" \
|
|
|
|
|
"test_check_ignore '
|
|
|
|
|
${subdir}non-existent
|
|
|
|
|
${subdir}one
|
|
|
|
|
${subdir}not-ignored
|
|
|
|
|
${subdir}ignored-but-in-index
|
|
|
|
|
${subdir}ignored-and-untracked'
|
|
|
|
|
"
|
2013-01-06 17:58:13 +01:00
|
|
|
done
|
|
|
|
|
|
|
|
|
|
# Having established the above, from now on we mostly test against
|
|
|
|
|
# files which do not exist in the working tree or index.
|
|
|
|
|
|
|
|
|
|
test_expect_success 'sub-directory local ignore' '
|
|
|
|
|
expect "a/3-three" &&
|
|
|
|
|
test_check_ignore "a/3-three a/three-not-this-one"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'sub-directory local ignore with --verbose' '
|
|
|
|
|
expect "a/.gitignore:2:*three a/3-three" &&
|
|
|
|
|
test_check_ignore "--verbose a/3-three a/three-not-this-one"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'local ignore inside a sub-directory' '
|
|
|
|
|
expect "3-three" &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "3-three three-not-this-one"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
test_expect_success 'local ignore inside a sub-directory with --verbose' '
|
|
|
|
|
expect "a/.gitignore:2:*three 3-three" &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "--verbose 3-three three-not-this-one"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
check-ignore: fix documentation and implementation to match
check-ignore has two different modes, and neither of these modes has an
implementation that matches the documentation. These modes differ in
whether they just print paths or whether they also print the final
pattern matched by the path. The fix is different for both modes, so
I'll discuss both separately.
=== First (default) mode ===
The first mode is documented as:
For each pathname given via the command-line or from a file via
--stdin, check whether the file is excluded by .gitignore (or other
input files to the exclude mechanism) and output the path if it is
excluded.
However, it fails to do this because it did not account for negated
patterns. Commands other than check-ignore verify exclusion rules via
calling
... -> treat_one_path() -> is_excluded() -> last_matching_pattern()
while check-ignore has a call path of the form:
... -> check_ignore() -> last_matching_pattern()
The fact that the latter does not include the call to is_excluded()
means that it is susceptible to to messing up negated patterns (since
that is the only significant thing is_excluded() adds over
last_matching_pattern()). Unfortunately, we can't make it just call
is_excluded(), because the same codepath is used by the verbose mode
which needs to know the matched pattern in question. This brings us
to...
=== Second (verbose) mode ===
The second mode, known as verbose mode, references the first in the
documentation and says:
Also output details about the matching pattern (if any) for each
given pathname. For precedence rules within and between exclude
sources, see gitignore(5).
The "Also" means it will print patterns that match the exclude rules as
noted for the first mode, and also print which pattern matches. Unless
more information is printed than just pathname and pattern (which is not
done), this definition is somewhat ill-defined and perhaps even
self-contradictory for negated patterns: A path which matches a negated
exclude pattern is NOT excluded and thus shouldn't be printed by the
former logic, while it certainly does match one of the explicit patterns
and thus should be printed by the latter logic.
=== Resolution ==
Since the second mode exists to find out which pattern matches given
paths, and showing the user a pattern that begins with a '!' is
sufficient for them to figure out whether the pattern is excluded, the
existing behavior is desirable -- we just need to update the
documentation to match the implementation (i.e. it is about printing
which pattern is matched by paths, not about showing which paths are
excluded).
For the first or default mode, users just want to know whether a pattern
is excluded. As such, the existing documentation is desirable; change
the implementation to match the documented behavior.
Finally, also adjust a few tests in t0008 that were caught up by this
discrepancy in how negated paths were handled.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-19 00:05:37 +01:00
|
|
|
test_expect_success 'nested include of negated pattern' '
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore "a/b/one" 1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'nested include of negated pattern with -q' '
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore "-q a/b/one" 1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'nested include of negated pattern with -v' '
|
|
|
|
|
expect "a/b/.gitignore:8:!on* a/b/one" &&
|
|
|
|
|
test_check_ignore "-v a/b/one" 0
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'nested include of negated pattern with -v -n' '
|
|
|
|
|
expect "a/b/.gitignore:8:!on* a/b/one" &&
|
|
|
|
|
test_check_ignore "-v -n a/b/one" 0
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test ignored sub-directories
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi 'ignored sub-directory' \
|
|
|
|
|
'a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir' '
|
|
|
|
|
test_check_ignore "a/b/ignored-dir"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'multiple files inside ignored sub-directory' '
|
|
|
|
|
expect_from_stdin <<-\EOF &&
|
|
|
|
|
a/b/ignored-dir/foo
|
|
|
|
|
a/b/ignored-dir/twoooo
|
|
|
|
|
a/b/ignored-dir/seven
|
|
|
|
|
EOF
|
|
|
|
|
test_check_ignore "a/b/ignored-dir/foo a/b/ignored-dir/twoooo a/b/ignored-dir/seven"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'multiple files inside ignored sub-directory with -v' '
|
|
|
|
|
expect_from_stdin <<-\EOF &&
|
|
|
|
|
a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir/foo
|
|
|
|
|
a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir/twoooo
|
|
|
|
|
a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir/seven
|
|
|
|
|
EOF
|
|
|
|
|
test_check_ignore "-v a/b/ignored-dir/foo a/b/ignored-dir/twoooo a/b/ignored-dir/seven"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'cd to ignored sub-directory' '
|
|
|
|
|
expect_from_stdin <<-\EOF &&
|
|
|
|
|
foo
|
|
|
|
|
twoooo
|
|
|
|
|
seven
|
|
|
|
|
../../one
|
|
|
|
|
EOF
|
|
|
|
|
(
|
|
|
|
|
cd a/b/ignored-dir &&
|
|
|
|
|
test_check_ignore "foo twoooo ../one seven ../../one"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'cd to ignored sub-directory with -v' '
|
|
|
|
|
expect_from_stdin <<-\EOF &&
|
|
|
|
|
a/b/.gitignore:5:ignored-dir/ foo
|
|
|
|
|
a/b/.gitignore:5:ignored-dir/ twoooo
|
|
|
|
|
a/b/.gitignore:8:!on* ../one
|
|
|
|
|
a/b/.gitignore:5:ignored-dir/ seven
|
|
|
|
|
.gitignore:1:one ../../one
|
|
|
|
|
EOF
|
|
|
|
|
(
|
|
|
|
|
cd a/b/ignored-dir &&
|
|
|
|
|
test_check_ignore "-v foo twoooo ../one seven ../../one"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test handling of symlinks
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success_multi SYMLINKS 'symlink' ':: a/symlink' '
|
2013-01-06 17:58:13 +01:00
|
|
|
test_check_ignore "a/symlink" 1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi SYMLINKS 'beyond a symlink' '' '
|
|
|
|
|
test_check_ignore "a/symlink/foo" 128 &&
|
2013-07-14 10:35:45 +02:00
|
|
|
test_stderr "fatal: pathspec '\''a/symlink/foo'\'' is beyond a symbolic link"
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi SYMLINKS 'beyond a symlink from subdirectory' '' '
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "symlink/foo" 128
|
|
|
|
|
) &&
|
2013-07-14 10:35:45 +02:00
|
|
|
test_stderr "fatal: pathspec '\''symlink/foo'\'' is beyond a symbolic link"
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test handling of submodules
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi 'submodule' '' '
|
|
|
|
|
test_check_ignore "a/submodule/one" 128 &&
|
2013-07-14 10:35:45 +02:00
|
|
|
test_stderr "fatal: Pathspec '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''"
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success_multi 'submodule from subdirectory' '' '
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "submodule/one" 128
|
|
|
|
|
) &&
|
2013-07-14 10:35:45 +02:00
|
|
|
test_stderr "fatal: Pathspec '\''submodule/one'\'' is in submodule '\''a/submodule'\''"
|
2013-01-06 17:58:13 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test handling of global ignore files
|
|
|
|
|
|
|
|
|
|
test_expect_success 'global ignore not yet enabled' '
|
|
|
|
|
expect_from_stdin <<-\EOF &&
|
|
|
|
|
.git/info/exclude:7:per-repo per-repo
|
|
|
|
|
a/.gitignore:2:*three a/globalthree
|
|
|
|
|
.git/info/exclude:7:per-repo a/per-repo
|
|
|
|
|
EOF
|
|
|
|
|
test_check_ignore "-v globalone per-repo a/globalthree a/per-repo not-ignored a/globaltwo"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'global ignore' '
|
|
|
|
|
enable_global_excludes &&
|
|
|
|
|
expect_from_stdin <<-\EOF &&
|
|
|
|
|
globalone
|
|
|
|
|
per-repo
|
|
|
|
|
globalthree
|
|
|
|
|
a/globalthree
|
|
|
|
|
a/per-repo
|
|
|
|
|
EOF
|
|
|
|
|
test_check_ignore "globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'global ignore with -v' '
|
|
|
|
|
enable_global_excludes &&
|
|
|
|
|
expect_from_stdin <<-EOF &&
|
|
|
|
|
$global_excludes:1:globalone globalone
|
|
|
|
|
.git/info/exclude:7:per-repo per-repo
|
|
|
|
|
$global_excludes:3:globalthree globalthree
|
|
|
|
|
a/.gitignore:2:*three a/globalthree
|
|
|
|
|
.git/info/exclude:7:per-repo a/per-repo
|
|
|
|
|
$global_excludes:2:!globaltwo globaltwo
|
|
|
|
|
EOF
|
|
|
|
|
test_check_ignore "-v globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test --stdin
|
|
|
|
|
|
|
|
|
|
cat <<-\EOF >stdin
|
|
|
|
|
one
|
|
|
|
|
not-ignored
|
|
|
|
|
a/one
|
|
|
|
|
a/not-ignored
|
|
|
|
|
a/b/on
|
|
|
|
|
a/b/one
|
|
|
|
|
a/b/one one
|
|
|
|
|
"a/b/one two"
|
|
|
|
|
"a/b/one\"three"
|
|
|
|
|
a/b/not-ignored
|
|
|
|
|
a/b/two
|
|
|
|
|
a/b/twooo
|
|
|
|
|
globaltwo
|
|
|
|
|
a/globaltwo
|
|
|
|
|
a/b/globaltwo
|
|
|
|
|
b/globaltwo
|
|
|
|
|
EOF
|
|
|
|
|
cat <<-\EOF >expected-default
|
|
|
|
|
one
|
|
|
|
|
a/one
|
|
|
|
|
a/b/twooo
|
|
|
|
|
EOF
|
|
|
|
|
cat <<-EOF >expected-verbose
|
|
|
|
|
.gitignore:1:one one
|
|
|
|
|
.gitignore:1:one a/one
|
|
|
|
|
a/b/.gitignore:8:!on* a/b/on
|
|
|
|
|
a/b/.gitignore:8:!on* a/b/one
|
|
|
|
|
a/b/.gitignore:8:!on* a/b/one one
|
|
|
|
|
a/b/.gitignore:8:!on* a/b/one two
|
2016-05-20 16:31:30 +02:00
|
|
|
a/b/.gitignore:8:!on* "a/b/one\\"three"
|
2013-01-06 17:58:13 +01:00
|
|
|
a/b/.gitignore:9:!two a/b/two
|
|
|
|
|
a/.gitignore:1:two* a/b/twooo
|
|
|
|
|
$global_excludes:2:!globaltwo globaltwo
|
|
|
|
|
$global_excludes:2:!globaltwo a/globaltwo
|
|
|
|
|
$global_excludes:2:!globaltwo a/b/globaltwo
|
|
|
|
|
$global_excludes:2:!globaltwo b/globaltwo
|
|
|
|
|
EOF
|
|
|
|
|
|
2013-10-28 22:43:00 +01:00
|
|
|
broken_c_unquote stdin >stdin0
|
|
|
|
|
|
|
|
|
|
broken_c_unquote expected-default >expected-default0
|
|
|
|
|
|
|
|
|
|
broken_c_unquote_verbose expected-verbose >expected-verbose0
|
2013-01-06 17:58:13 +01:00
|
|
|
|
|
|
|
|
test_expect_success '--stdin' '
|
|
|
|
|
expect_from_stdin <expected-default &&
|
|
|
|
|
test_check_ignore "--stdin" <stdin
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--stdin -q' '
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore "-q --stdin" <stdin
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--stdin -v' '
|
|
|
|
|
expect_from_stdin <expected-verbose &&
|
|
|
|
|
test_check_ignore "-v --stdin" <stdin
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
for opts in '--stdin -z' '-z --stdin'
|
|
|
|
|
do
|
|
|
|
|
test_expect_success "$opts" "
|
|
|
|
|
expect_from_stdin <expected-default0 &&
|
|
|
|
|
test_check_ignore '$opts' <stdin0
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
test_expect_success "$opts -q" "
|
|
|
|
|
expect "" &&
|
|
|
|
|
test_check_ignore '-q $opts' <stdin0
|
|
|
|
|
"
|
|
|
|
|
|
|
|
|
|
test_expect_success "$opts -v" "
|
|
|
|
|
expect_from_stdin <expected-verbose0 &&
|
|
|
|
|
test_check_ignore '-v $opts' <stdin0
|
|
|
|
|
"
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
cat <<-\EOF >stdin
|
|
|
|
|
../one
|
|
|
|
|
../not-ignored
|
|
|
|
|
one
|
|
|
|
|
not-ignored
|
|
|
|
|
b/on
|
|
|
|
|
b/one
|
|
|
|
|
b/one one
|
|
|
|
|
"b/one two"
|
|
|
|
|
"b/one\"three"
|
|
|
|
|
b/two
|
|
|
|
|
b/not-ignored
|
|
|
|
|
b/twooo
|
|
|
|
|
../globaltwo
|
|
|
|
|
globaltwo
|
|
|
|
|
b/globaltwo
|
|
|
|
|
../b/globaltwo
|
2013-04-11 14:05:10 +02:00
|
|
|
c/not-ignored
|
2013-01-06 17:58:13 +01:00
|
|
|
EOF
|
2013-04-11 14:05:10 +02:00
|
|
|
# N.B. we deliberately end STDIN with a non-matching pattern in order
|
|
|
|
|
# to test that the exit code indicates that one or more of the
|
|
|
|
|
# provided paths is ignored - in other words, that it represents an
|
|
|
|
|
# aggregation of all the results, not just the final result.
|
|
|
|
|
|
|
|
|
|
cat <<-EOF >expected-all
|
2013-01-06 17:58:13 +01:00
|
|
|
.gitignore:1:one ../one
|
2013-04-11 14:05:10 +02:00
|
|
|
:: ../not-ignored
|
2013-01-06 17:58:13 +01:00
|
|
|
.gitignore:1:one one
|
2013-04-11 14:05:10 +02:00
|
|
|
:: not-ignored
|
2013-01-06 17:58:13 +01:00
|
|
|
a/b/.gitignore:8:!on* b/on
|
|
|
|
|
a/b/.gitignore:8:!on* b/one
|
|
|
|
|
a/b/.gitignore:8:!on* b/one one
|
|
|
|
|
a/b/.gitignore:8:!on* b/one two
|
2016-05-20 16:31:30 +02:00
|
|
|
a/b/.gitignore:8:!on* "b/one\\"three"
|
2013-01-06 17:58:13 +01:00
|
|
|
a/b/.gitignore:9:!two b/two
|
2013-04-11 14:05:10 +02:00
|
|
|
:: b/not-ignored
|
2013-01-06 17:58:13 +01:00
|
|
|
a/.gitignore:1:two* b/twooo
|
|
|
|
|
$global_excludes:2:!globaltwo ../globaltwo
|
|
|
|
|
$global_excludes:2:!globaltwo globaltwo
|
|
|
|
|
$global_excludes:2:!globaltwo b/globaltwo
|
|
|
|
|
$global_excludes:2:!globaltwo ../b/globaltwo
|
2013-04-11 14:05:10 +02:00
|
|
|
:: c/not-ignored
|
2013-01-06 17:58:13 +01:00
|
|
|
EOF
|
check-ignore: fix documentation and implementation to match
check-ignore has two different modes, and neither of these modes has an
implementation that matches the documentation. These modes differ in
whether they just print paths or whether they also print the final
pattern matched by the path. The fix is different for both modes, so
I'll discuss both separately.
=== First (default) mode ===
The first mode is documented as:
For each pathname given via the command-line or from a file via
--stdin, check whether the file is excluded by .gitignore (or other
input files to the exclude mechanism) and output the path if it is
excluded.
However, it fails to do this because it did not account for negated
patterns. Commands other than check-ignore verify exclusion rules via
calling
... -> treat_one_path() -> is_excluded() -> last_matching_pattern()
while check-ignore has a call path of the form:
... -> check_ignore() -> last_matching_pattern()
The fact that the latter does not include the call to is_excluded()
means that it is susceptible to to messing up negated patterns (since
that is the only significant thing is_excluded() adds over
last_matching_pattern()). Unfortunately, we can't make it just call
is_excluded(), because the same codepath is used by the verbose mode
which needs to know the matched pattern in question. This brings us
to...
=== Second (verbose) mode ===
The second mode, known as verbose mode, references the first in the
documentation and says:
Also output details about the matching pattern (if any) for each
given pathname. For precedence rules within and between exclude
sources, see gitignore(5).
The "Also" means it will print patterns that match the exclude rules as
noted for the first mode, and also print which pattern matches. Unless
more information is printed than just pathname and pattern (which is not
done), this definition is somewhat ill-defined and perhaps even
self-contradictory for negated patterns: A path which matches a negated
exclude pattern is NOT excluded and thus shouldn't be printed by the
former logic, while it certainly does match one of the explicit patterns
and thus should be printed by the latter logic.
=== Resolution ==
Since the second mode exists to find out which pattern matches given
paths, and showing the user a pattern that begins with a '!' is
sufficient for them to figure out whether the pattern is excluded, the
existing behavior is desirable -- we just need to update the
documentation to match the implementation (i.e. it is about printing
which pattern is matched by paths, not about showing which paths are
excluded).
For the first or default mode, users just want to know whether a pattern
is excluded. As such, the existing documentation is desirable; change
the implementation to match the documented behavior.
Finally, also adjust a few tests in t0008 that were caught up by this
discrepancy in how negated paths were handled.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-02-19 00:05:37 +01:00
|
|
|
cat <<-EOF >expected-default
|
|
|
|
|
../one
|
|
|
|
|
one
|
|
|
|
|
b/twooo
|
|
|
|
|
EOF
|
2013-04-11 14:05:10 +02:00
|
|
|
grep -v '^:: ' expected-all >expected-verbose
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2013-10-28 22:43:00 +01:00
|
|
|
broken_c_unquote stdin >stdin0
|
|
|
|
|
|
|
|
|
|
broken_c_unquote expected-default >expected-default0
|
|
|
|
|
|
|
|
|
|
broken_c_unquote_verbose expected-verbose >expected-verbose0
|
2013-01-06 17:58:13 +01:00
|
|
|
|
|
|
|
|
test_expect_success '--stdin from subdirectory' '
|
|
|
|
|
expect_from_stdin <expected-default &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "--stdin" <../stdin
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success '--stdin from subdirectory with -v' '
|
|
|
|
|
expect_from_stdin <expected-verbose &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "--stdin -v" <../stdin
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2013-04-11 14:05:10 +02:00
|
|
|
test_expect_success '--stdin from subdirectory with -v -n' '
|
|
|
|
|
expect_from_stdin <expected-all &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "--stdin -v -n" <../stdin
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2013-01-06 17:58:13 +01:00
|
|
|
for opts in '--stdin -z' '-z --stdin'
|
|
|
|
|
do
|
|
|
|
|
test_expect_success "$opts from subdirectory" '
|
|
|
|
|
expect_from_stdin <expected-default0 &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "'"$opts"'" <../stdin0
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success "$opts from subdirectory with -v" '
|
|
|
|
|
expect_from_stdin <expected-verbose0 &&
|
|
|
|
|
(
|
|
|
|
|
cd a &&
|
|
|
|
|
test_check_ignore "'"$opts"' -v" <../stdin0
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
done
|
|
|
|
|
|
2013-04-30 00:55:25 +02:00
|
|
|
test_expect_success PIPE 'streaming support for --stdin' '
|
|
|
|
|
mkfifo in out &&
|
|
|
|
|
(git check-ignore -n -v --stdin <in >out &) &&
|
|
|
|
|
|
|
|
|
|
# We cannot just "echo >in" because check-ignore would get EOF
|
|
|
|
|
# after echo exited; instead we open the descriptor in our
|
|
|
|
|
# shell, and then echo to the fd. We make sure to close it at
|
|
|
|
|
# the end, so that the subprocess does get EOF and dies
|
|
|
|
|
# properly.
|
t0008: avoid SIGPIPE race condition on fifo
To test check-ignore's --stdin feature, we use two fifos to
send and receive data. We carefully keep a descriptor to its
input open so that it does not receive EOF between input
lines. However, we do not do the same for its output. That
means there is a potential race condition in which
check-ignore has opened the output pipe once (when we read
the first line), and then writes the second line before we
have re-opened the pipe.
In that case, check-ignore gets a SIGPIPE and dies. The
outer shell then tries to open the output fifo but blocks
indefinitely, because there is no writer. We can fix it by
keeping a descriptor open through the whole procedure.
This should also help if check-ignore dies for any other
reason (we would already have opened the fifo and would
therefore not block, but just get EOF on read).
However, we are technically still susceptible to
check-ignore dying early, before we have opened the fifo.
This is an unlikely race and shouldn't generally happen in
practice, though, so we can hopefully ignore it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12 12:35:23 +02:00
|
|
|
#
|
|
|
|
|
# Similarly, we must keep "out" open so that check-ignore does
|
|
|
|
|
# not ever get SIGPIPE trying to write to us. Not only would that
|
|
|
|
|
# produce incorrect results, but then there would be no writer on the
|
|
|
|
|
# other end of the pipe, and we would potentially block forever trying
|
|
|
|
|
# to open it.
|
2013-04-30 00:55:25 +02:00
|
|
|
exec 9>in &&
|
t0008: avoid SIGPIPE race condition on fifo
To test check-ignore's --stdin feature, we use two fifos to
send and receive data. We carefully keep a descriptor to its
input open so that it does not receive EOF between input
lines. However, we do not do the same for its output. That
means there is a potential race condition in which
check-ignore has opened the output pipe once (when we read
the first line), and then writes the second line before we
have re-opened the pipe.
In that case, check-ignore gets a SIGPIPE and dies. The
outer shell then tries to open the output fifo but blocks
indefinitely, because there is no writer. We can fix it by
keeping a descriptor open through the whole procedure.
This should also help if check-ignore dies for any other
reason (we would already have opened the fifo and would
therefore not block, but just get EOF on read).
However, we are technically still susceptible to
check-ignore dying early, before we have opened the fifo.
This is an unlikely race and shouldn't generally happen in
practice, though, so we can hopefully ignore it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12 12:35:23 +02:00
|
|
|
exec 8<out &&
|
2013-04-30 00:55:25 +02:00
|
|
|
test_when_finished "exec 9>&-" &&
|
t0008: avoid SIGPIPE race condition on fifo
To test check-ignore's --stdin feature, we use two fifos to
send and receive data. We carefully keep a descriptor to its
input open so that it does not receive EOF between input
lines. However, we do not do the same for its output. That
means there is a potential race condition in which
check-ignore has opened the output pipe once (when we read
the first line), and then writes the second line before we
have re-opened the pipe.
In that case, check-ignore gets a SIGPIPE and dies. The
outer shell then tries to open the output fifo but blocks
indefinitely, because there is no writer. We can fix it by
keeping a descriptor open through the whole procedure.
This should also help if check-ignore dies for any other
reason (we would already have opened the fifo and would
therefore not block, but just get EOF on read).
However, we are technically still susceptible to
check-ignore dying early, before we have opened the fifo.
This is an unlikely race and shouldn't generally happen in
practice, though, so we can hopefully ignore it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12 12:35:23 +02:00
|
|
|
test_when_finished "exec 8<&-" &&
|
2013-04-30 00:55:25 +02:00
|
|
|
echo >&9 one &&
|
t0008: avoid SIGPIPE race condition on fifo
To test check-ignore's --stdin feature, we use two fifos to
send and receive data. We carefully keep a descriptor to its
input open so that it does not receive EOF between input
lines. However, we do not do the same for its output. That
means there is a potential race condition in which
check-ignore has opened the output pipe once (when we read
the first line), and then writes the second line before we
have re-opened the pipe.
In that case, check-ignore gets a SIGPIPE and dies. The
outer shell then tries to open the output fifo but blocks
indefinitely, because there is no writer. We can fix it by
keeping a descriptor open through the whole procedure.
This should also help if check-ignore dies for any other
reason (we would already have opened the fifo and would
therefore not block, but just get EOF on read).
However, we are technically still susceptible to
check-ignore dying early, before we have opened the fifo.
This is an unlikely race and shouldn't generally happen in
practice, though, so we can hopefully ignore it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12 12:35:23 +02:00
|
|
|
read response <&8 &&
|
2013-04-30 00:55:25 +02:00
|
|
|
echo "$response" | grep "^\.gitignore:1:one one" &&
|
|
|
|
|
echo >&9 two &&
|
t0008: avoid SIGPIPE race condition on fifo
To test check-ignore's --stdin feature, we use two fifos to
send and receive data. We carefully keep a descriptor to its
input open so that it does not receive EOF between input
lines. However, we do not do the same for its output. That
means there is a potential race condition in which
check-ignore has opened the output pipe once (when we read
the first line), and then writes the second line before we
have re-opened the pipe.
In that case, check-ignore gets a SIGPIPE and dies. The
outer shell then tries to open the output fifo but blocks
indefinitely, because there is no writer. We can fix it by
keeping a descriptor open through the whole procedure.
This should also help if check-ignore dies for any other
reason (we would already have opened the fifo and would
therefore not block, but just get EOF on read).
However, we are technically still susceptible to
check-ignore dying early, before we have opened the fifo.
This is an unlikely race and shouldn't generally happen in
practice, though, so we can hopefully ignore it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-07-12 12:35:23 +02:00
|
|
|
read response <&8 &&
|
2013-04-30 00:55:25 +02:00
|
|
|
echo "$response" | grep "^:: two"
|
2013-04-11 14:05:12 +02:00
|
|
|
'
|
2013-01-06 17:58:13 +01:00
|
|
|
|
2018-02-10 13:38:29 +01:00
|
|
|
test_expect_success 'existing file and directory' '
|
|
|
|
|
test_when_finished "rm one" &&
|
|
|
|
|
test_when_finished "rmdir top-level-dir" &&
|
|
|
|
|
>one &&
|
|
|
|
|
mkdir top-level-dir &&
|
|
|
|
|
git check-ignore one top-level-dir >actual &&
|
|
|
|
|
grep one actual &&
|
|
|
|
|
grep top-level-dir actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'existing directory and file' '
|
|
|
|
|
test_when_finished "rm one" &&
|
|
|
|
|
test_when_finished "rmdir top-level-dir" &&
|
|
|
|
|
>one &&
|
|
|
|
|
mkdir top-level-dir &&
|
|
|
|
|
git check-ignore top-level-dir one >actual &&
|
|
|
|
|
grep one actual &&
|
|
|
|
|
grep top-level-dir actual
|
|
|
|
|
'
|
|
|
|
|
|
2021-11-02 15:40:06 +01:00
|
|
|
test_expect_success 'exact prefix matching (with root)' '
|
|
|
|
|
test_when_finished rm -r a &&
|
|
|
|
|
mkdir -p a/git a/git-foo &&
|
|
|
|
|
touch a/git/foo a/git-foo/bar &&
|
|
|
|
|
echo /git/ >a/.gitignore &&
|
|
|
|
|
git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
a/git
|
|
|
|
|
a/git/foo
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'exact prefix matching (without root)' '
|
|
|
|
|
test_when_finished rm -r a &&
|
|
|
|
|
mkdir -p a/git a/git-foo &&
|
|
|
|
|
touch a/git/foo a/git-foo/bar &&
|
|
|
|
|
echo git/ >a/.gitignore &&
|
|
|
|
|
git check-ignore a/git a/git/foo a/git-foo a/git-foo/bar >actual &&
|
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
|
a/git
|
|
|
|
|
a/git/foo
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2014-02-09 01:26:37 +01:00
|
|
|
############################################################################
|
|
|
|
|
#
|
|
|
|
|
# test whitespace handling
|
|
|
|
|
|
2014-02-09 01:26:38 +01:00
|
|
|
test_expect_success 'trailing whitespace is ignored' '
|
2014-02-09 01:26:37 +01:00
|
|
|
mkdir whitespace &&
|
|
|
|
|
>whitespace/trailing &&
|
|
|
|
|
>whitespace/untracked &&
|
|
|
|
|
echo "whitespace/trailing " >ignore &&
|
|
|
|
|
cat >expect <<EOF &&
|
|
|
|
|
whitespace/untracked
|
|
|
|
|
EOF
|
|
|
|
|
git ls-files -o -X ignore whitespace >actual 2>err &&
|
2014-02-09 01:26:38 +01:00
|
|
|
test_cmp expect actual &&
|
2018-07-27 19:48:11 +02:00
|
|
|
test_must_be_empty err
|
2014-02-09 01:26:37 +01:00
|
|
|
'
|
|
|
|
|
|
2014-03-11 08:46:40 +01:00
|
|
|
test_expect_success !MINGW 'quoting allows trailing whitespace' '
|
2014-02-09 01:26:37 +01:00
|
|
|
rm -rf whitespace &&
|
|
|
|
|
mkdir whitespace &&
|
|
|
|
|
>"whitespace/trailing " &&
|
|
|
|
|
>whitespace/untracked &&
|
|
|
|
|
echo "whitespace/trailing\\ \\ " >ignore &&
|
|
|
|
|
echo whitespace/untracked >expect &&
|
|
|
|
|
git ls-files -o -X ignore whitespace >actual 2>err &&
|
|
|
|
|
test_cmp expect actual &&
|
2018-07-27 19:48:11 +02:00
|
|
|
test_must_be_empty err
|
2014-02-09 01:26:37 +01:00
|
|
|
'
|
|
|
|
|
|
2014-07-22 00:09:27 +02:00
|
|
|
test_expect_success !MINGW,!CYGWIN 'correct handling of backslashes' '
|
2014-06-03 00:36:56 +02:00
|
|
|
rm -rf whitespace &&
|
|
|
|
|
mkdir whitespace &&
|
|
|
|
|
>"whitespace/trailing 1 " &&
|
|
|
|
|
>"whitespace/trailing 2 \\\\" &&
|
|
|
|
|
>"whitespace/trailing 3 \\\\" &&
|
|
|
|
|
>"whitespace/trailing 4 \\ " &&
|
|
|
|
|
>"whitespace/trailing 5 \\ \\ " &&
|
|
|
|
|
>"whitespace/trailing 6 \\a\\" &&
|
|
|
|
|
>whitespace/untracked &&
|
2014-06-13 22:23:58 +02:00
|
|
|
sed -e "s/Z$//" >ignore <<-\EOF &&
|
|
|
|
|
whitespace/trailing 1 \ Z
|
|
|
|
|
whitespace/trailing 2 \\\\Z
|
|
|
|
|
whitespace/trailing 3 \\\\ Z
|
|
|
|
|
whitespace/trailing 4 \\\ Z
|
|
|
|
|
whitespace/trailing 5 \\ \\\ Z
|
|
|
|
|
whitespace/trailing 6 \\a\\Z
|
|
|
|
|
EOF
|
2014-06-03 00:36:56 +02:00
|
|
|
echo whitespace/untracked >expect &&
|
|
|
|
|
git ls-files -o -X ignore whitespace >actual 2>err &&
|
|
|
|
|
test_cmp expect actual &&
|
2018-07-27 19:48:11 +02:00
|
|
|
test_must_be_empty err
|
2014-06-03 00:36:56 +02:00
|
|
|
'
|
|
|
|
|
|
2015-04-22 23:31:49 +02:00
|
|
|
test_expect_success 'info/exclude trumps core.excludesfile' '
|
|
|
|
|
echo >>global-excludes usually-ignored &&
|
|
|
|
|
echo >>.git/info/exclude "!usually-ignored" &&
|
|
|
|
|
>usually-ignored &&
|
|
|
|
|
echo "?? usually-ignored" >expect &&
|
|
|
|
|
|
|
|
|
|
git status --porcelain usually-ignored >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2021-02-16 15:44:34 +01:00
|
|
|
test_expect_success SYMLINKS 'set up ignore file for symlink tests' '
|
|
|
|
|
echo "*" >ignore &&
|
|
|
|
|
rm -f .gitignore .git/info/exclude
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'symlinks respected in core.excludesFile' '
|
|
|
|
|
test_when_finished "rm symlink" &&
|
|
|
|
|
ln -s ignore symlink &&
|
|
|
|
|
test_config core.excludesFile "$(pwd)/symlink" &&
|
|
|
|
|
echo file >expect &&
|
|
|
|
|
git check-ignore file >actual 2>err &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_be_empty err
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'symlinks respected in info/exclude' '
|
|
|
|
|
test_when_finished "rm .git/info/exclude" &&
|
|
|
|
|
ln -s ../../ignore .git/info/exclude &&
|
|
|
|
|
echo file >expect &&
|
|
|
|
|
git check-ignore file >actual 2>err &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test_must_be_empty err
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success SYMLINKS 'symlinks not respected in-tree' '
|
|
|
|
|
test_when_finished "rm .gitignore" &&
|
|
|
|
|
ln -s ignore .gitignore &&
|
|
|
|
|
mkdir subdir &&
|
|
|
|
|
ln -s ignore subdir/.gitignore &&
|
|
|
|
|
test_must_fail git check-ignore subdir/file >actual 2>err &&
|
|
|
|
|
test_must_be_empty actual &&
|
|
|
|
|
test_i18ngrep "unable to access.*gitignore" err
|
|
|
|
|
'
|
|
|
|
|
|
2013-01-06 17:58:13 +01:00
|
|
|
test_done
|