mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
69f272b922
Commits404ebceda0("dir: also check directories for matching pathspecs", 2019-09-17) and89a1f4aaf7("dir: if our pathspec might match files under a dir, recurse into it", 2019-09-17) added calls to match_pathspec() and do_match_pathspec() passing along their pathspec parameter. Both match_pathspec() and do_match_pathspec() assume the pathspec argument they are given is non-NULL. It turns out that unpack-tree.c's verify_clean_subdirectory() calls read_directory() with pathspec == NULL, and it is possible on case insensitive filesystems for that NULL to make it to these new calls to match_pathspec() and do_match_pathspec(). Add appropriate checks on the NULLness of pathspec to avoid a segfault. In case the negation throws anyone off (one of the calls was to do_match_pathspec() while the other was to !match_pathspec(), yet no negation of the NULLness of pathspec is used), there are two ways to understand the differences: * The code already handled the pathspec == NULL cases before this series, and this series only tried to change behavior when there was a pathspec, thus we only want to go into the if-block if pathspec is non-NULL. * One of the calls is for whether to recurse into a subdirectory, the other is for after we've recursed into it for whether we want to remove the subdirectory itself (i.e. the subdirectory didn't match but something under it could have). That difference in situation leads to the slight differences in logic used (well, that and the slightly unusual fact that we don't want empty pathspecs to remove untracked directories by default). Denton found and analyzed one issue and provided the patch for the match_pathspec() call, SZEDER figured out why the issue only reproduced for some folks and not others and provided the testcase, and I looked through the remainder of the series and noted the do_match_pathspec() call that should have the same check. Co-authored-by: Denton Liu <liu.denton@gmail.com> Co-authored-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
155 lines
3.4 KiB
Bash
Executable File
155 lines
3.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Various filesystem issues'
|
|
|
|
. ./test-lib.sh
|
|
|
|
auml=$(printf '\303\244')
|
|
aumlcdiar=$(printf '\141\314\210')
|
|
|
|
if test_have_prereq CASE_INSENSITIVE_FS
|
|
then
|
|
say "will test on a case insensitive filesystem"
|
|
test_case=test_expect_failure
|
|
else
|
|
test_case=test_expect_success
|
|
fi
|
|
|
|
if test_have_prereq UTF8_NFD_TO_NFC
|
|
then
|
|
say "will test on a unicode corrupting filesystem"
|
|
test_unicode=test_expect_failure
|
|
else
|
|
test_unicode=test_expect_success
|
|
fi
|
|
|
|
test_have_prereq SYMLINKS ||
|
|
say "will test on a filesystem lacking symbolic links"
|
|
|
|
if test_have_prereq CASE_INSENSITIVE_FS
|
|
then
|
|
test_expect_success "detection of case insensitive filesystem during repo init" '
|
|
test $(git config --bool core.ignorecase) = true
|
|
'
|
|
else
|
|
test_expect_success "detection of case insensitive filesystem during repo init" '
|
|
{
|
|
test_must_fail git config --bool core.ignorecase >/dev/null ||
|
|
test $(git config --bool core.ignorecase) = false
|
|
}
|
|
'
|
|
fi
|
|
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
test_expect_success "detection of filesystem w/o symlink support during repo init" '
|
|
{
|
|
test_must_fail git config --bool core.symlinks ||
|
|
test "$(git config --bool core.symlinks)" = true
|
|
}
|
|
'
|
|
else
|
|
test_expect_success "detection of filesystem w/o symlink support during repo init" '
|
|
v=$(git config --bool core.symlinks) &&
|
|
test "$v" = false
|
|
'
|
|
fi
|
|
|
|
test_expect_success "setup case tests" '
|
|
git config core.ignorecase true &&
|
|
touch camelcase &&
|
|
git add camelcase &&
|
|
git commit -m "initial" &&
|
|
git tag initial &&
|
|
git checkout -b topic &&
|
|
git mv camelcase tmp &&
|
|
git mv tmp CamelCase &&
|
|
git commit -m "rename" &&
|
|
git checkout -f master
|
|
'
|
|
|
|
test_expect_success 'rename (case change)' '
|
|
git mv camelcase CamelCase &&
|
|
git commit -m "rename"
|
|
'
|
|
|
|
test_expect_success 'merge (case change)' '
|
|
rm -f CamelCase &&
|
|
rm -f camelcase &&
|
|
git reset --hard initial &&
|
|
git merge topic
|
|
'
|
|
|
|
test_expect_success CASE_INSENSITIVE_FS 'add directory (with different case)' '
|
|
git reset --hard initial &&
|
|
mkdir -p dir1/dir2 &&
|
|
echo >dir1/dir2/a &&
|
|
echo >dir1/dir2/b &&
|
|
git add dir1/dir2/a &&
|
|
git add dir1/DIR2/b &&
|
|
git ls-files >actual &&
|
|
cat >expected <<-\EOF &&
|
|
camelcase
|
|
dir1/dir2/a
|
|
dir1/dir2/b
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '
|
|
git reset --hard initial &&
|
|
rm camelcase &&
|
|
echo 1 >CamelCase &&
|
|
git add CamelCase &&
|
|
camel=$(git ls-files | grep -i camelcase) &&
|
|
test $(echo "$camel" | wc -l) = 1 &&
|
|
test "z$(git cat-file blob :$camel)" = z1
|
|
'
|
|
|
|
test_expect_success "setup unicode normalization tests" '
|
|
test_create_repo unicode &&
|
|
cd unicode &&
|
|
git config core.precomposeunicode false &&
|
|
touch "$aumlcdiar" &&
|
|
git add "$aumlcdiar" &&
|
|
git commit -m initial &&
|
|
git tag initial &&
|
|
git checkout -b topic &&
|
|
git mv $aumlcdiar tmp &&
|
|
git mv tmp "$auml" &&
|
|
git commit -m rename &&
|
|
git checkout -f master
|
|
'
|
|
|
|
$test_unicode 'rename (silent unicode normalization)' '
|
|
git mv "$aumlcdiar" "$auml" &&
|
|
git commit -m rename
|
|
'
|
|
|
|
$test_unicode 'merge (silent unicode normalization)' '
|
|
git reset --hard initial &&
|
|
git merge topic
|
|
'
|
|
|
|
test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case insensitive fs' '
|
|
git init repo &&
|
|
(
|
|
cd repo &&
|
|
|
|
>Gitweb &&
|
|
git add Gitweb &&
|
|
git commit -m "add Gitweb" &&
|
|
|
|
git checkout --orphan todo &&
|
|
git reset --hard &&
|
|
mkdir -p gitweb/subdir &&
|
|
>gitweb/subdir/file &&
|
|
git add gitweb &&
|
|
git commit -m "add gitweb/subdir/file" &&
|
|
|
|
git checkout master
|
|
)
|
|
'
|
|
|
|
test_done
|