2008-02-24 18:19:09 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='Various filesystem issues'
|
|
|
|
|
2020-11-19 00:44:21 +01:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 00:44:19 +01:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2008-02-24 18:19:09 +01:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2010-12-21 21:27:55 +01:00
|
|
|
auml=$(printf '\303\244')
|
|
|
|
aumlcdiar=$(printf '\141\314\210')
|
2008-02-24 18:19:09 +01:00
|
|
|
|
2012-07-26 15:39:54 +02:00
|
|
|
if test_have_prereq CASE_INSENSITIVE_FS
|
|
|
|
then
|
2009-03-17 22:45:22 +01:00
|
|
|
say "will test on a case insensitive filesystem"
|
2012-07-26 15:39:54 +02:00
|
|
|
test_case=test_expect_failure
|
|
|
|
else
|
|
|
|
test_case=test_expect_success
|
|
|
|
fi
|
|
|
|
|
2012-07-26 15:39:56 +02:00
|
|
|
if test_have_prereq UTF8_NFD_TO_NFC
|
|
|
|
then
|
2009-03-17 22:45:22 +01:00
|
|
|
say "will test on a unicode corrupting filesystem"
|
2012-07-26 15:39:56 +02:00
|
|
|
test_unicode=test_expect_failure
|
|
|
|
else
|
|
|
|
test_unicode=test_expect_success
|
|
|
|
fi
|
|
|
|
|
2012-07-26 15:39:55 +02:00
|
|
|
test_have_prereq SYMLINKS ||
|
2009-03-04 19:40:27 +01:00
|
|
|
say "will test on a filesystem lacking symbolic links"
|
2009-03-17 22:45:22 +01:00
|
|
|
|
2012-07-26 15:39:54 +02:00
|
|
|
if test_have_prereq CASE_INSENSITIVE_FS
|
2008-05-11 18:16:40 +02:00
|
|
|
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" '
|
2015-03-20 11:13:25 +01:00
|
|
|
{
|
|
|
|
test_must_fail git config --bool core.ignorecase >/dev/null ||
|
|
|
|
test $(git config --bool core.ignorecase) = false
|
|
|
|
}
|
2008-05-11 18:16:40 +02:00
|
|
|
'
|
|
|
|
fi
|
|
|
|
|
2012-07-26 15:39:55 +02:00
|
|
|
if test_have_prereq SYMLINKS
|
2009-03-04 19:40:27 +01:00
|
|
|
then
|
|
|
|
test_expect_success "detection of filesystem w/o symlink support during repo init" '
|
2015-03-20 11:13:25 +01:00
|
|
|
{
|
|
|
|
test_must_fail git config --bool core.symlinks ||
|
|
|
|
test "$(git config --bool core.symlinks)" = true
|
|
|
|
}
|
2009-03-04 19:40:27 +01:00
|
|
|
'
|
|
|
|
else
|
|
|
|
test_expect_success "detection of filesystem w/o symlink support during repo init" '
|
2012-07-26 15:39:55 +02:00
|
|
|
v=$(git config --bool core.symlinks) &&
|
|
|
|
test "$v" = false
|
2009-03-04 19:40:27 +01:00
|
|
|
'
|
|
|
|
fi
|
|
|
|
|
2008-02-24 18:19:09 +01:00
|
|
|
test_expect_success "setup case tests" '
|
2008-05-11 18:16:41 +02:00
|
|
|
git config core.ignorecase true &&
|
2008-02-24 18:19:09 +01:00
|
|
|
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" &&
|
2020-11-19 00:44:21 +01:00
|
|
|
git checkout -f main
|
2008-02-24 18:19:09 +01:00
|
|
|
'
|
|
|
|
|
2014-11-28 17:57:18 +01:00
|
|
|
test_expect_success 'rename (case change)' '
|
2008-02-24 18:19:09 +01:00
|
|
|
git mv camelcase CamelCase &&
|
|
|
|
git commit -m "rename"
|
|
|
|
'
|
|
|
|
|
2013-01-21 17:45:43 +01:00
|
|
|
test_expect_success 'merge (case change)' '
|
2008-05-15 07:19:54 +02:00
|
|
|
rm -f CamelCase &&
|
|
|
|
rm -f camelcase &&
|
2008-02-24 18:19:09 +01:00
|
|
|
git reset --hard initial &&
|
|
|
|
git merge topic
|
|
|
|
'
|
|
|
|
|
2018-02-08 20:23:33 +01:00
|
|
|
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
|
|
|
|
'
|
2010-03-01 08:31:21 +01:00
|
|
|
|
2013-01-21 17:46:15 +01:00
|
|
|
test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' '
|
2008-05-11 18:16:42 +02:00
|
|
|
git reset --hard initial &&
|
|
|
|
rm camelcase &&
|
|
|
|
echo 1 >CamelCase &&
|
|
|
|
git add CamelCase &&
|
2010-03-01 08:31:21 +01:00
|
|
|
camel=$(git ls-files | grep -i camelcase) &&
|
|
|
|
test $(echo "$camel" | wc -l) = 1 &&
|
|
|
|
test "z$(git cat-file blob :$camel)" = z1
|
2008-05-11 18:16:42 +02:00
|
|
|
'
|
|
|
|
|
2008-02-24 18:19:09 +01:00
|
|
|
test_expect_success "setup unicode normalization tests" '
|
2013-01-21 17:46:31 +01:00
|
|
|
test_create_repo unicode &&
|
|
|
|
cd unicode &&
|
2013-08-27 15:50:40 +02:00
|
|
|
git config core.precomposeunicode false &&
|
2013-01-21 17:46:31 +01:00
|
|
|
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 &&
|
2020-11-19 00:44:21 +01:00
|
|
|
git checkout -f main
|
2008-02-24 18:19:09 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
$test_unicode 'rename (silent unicode normalization)' '
|
2013-01-21 17:46:31 +01:00
|
|
|
git mv "$aumlcdiar" "$auml" &&
|
|
|
|
git commit -m rename
|
2008-02-24 18:19:09 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
$test_unicode 'merge (silent unicode normalization)' '
|
2013-01-21 17:46:31 +01:00
|
|
|
git reset --hard initial &&
|
|
|
|
git merge topic
|
2008-02-24 18:19:09 +01:00
|
|
|
'
|
|
|
|
|
dir: special case check for the possibility that pathspec is NULL
Commits 404ebceda01c ("dir: also check directories for matching
pathspecs", 2019-09-17) and 89a1f4aaf765 ("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>
2019-10-01 20:55:24 +02:00
|
|
|
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" &&
|
|
|
|
|
2020-11-19 00:44:21 +01:00
|
|
|
git checkout main
|
dir: special case check for the possibility that pathspec is NULL
Commits 404ebceda01c ("dir: also check directories for matching
pathspecs", 2019-09-17) and 89a1f4aaf765 ("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>
2019-10-01 20:55:24 +02:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2008-02-24 18:19:09 +01:00
|
|
|
test_done
|