mirror of
https://github.com/git/git
synced 2024-07-17 02:57:48 +00:00
6789275d37
They are equivalents and the former still exists, so as long as the
only change this commit makes are to rewrite test_i18ngrep to
test_grep, there won't be any new bug, even if there still are
callers of test_i18ngrep remaining in the tree, or when merged to
other topics that add new uses of test_i18ngrep.
This patch was produced more or less with
git grep -l -e 'test_i18ngrep ' 't/t[0-9][0-9][0-9][0-9]-*.sh' |
xargs perl -p -i -e 's/test_i18ngrep /test_grep /'
and a good way to sanity check the result yourself is to run the
above in a checkout of c4603c1c (test framework: further deprecate
test_i18ngrep, 2023-10-31) and compare the resulting working tree
contents with the result of applying this patch to the same commit.
You'll see that test_i18ngrep in a few t/lib-*.sh files corrected,
in addition to the manual reproduction.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
53 lines
1.5 KiB
Bash
Executable file
53 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='check handling of .gitmodule path with dash'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
git config --global protocol.file.allow always
|
|
'
|
|
|
|
test_expect_success 'create submodule with dash in path' '
|
|
git init upstream &&
|
|
git -C upstream commit --allow-empty -m base &&
|
|
git submodule add ./upstream sub &&
|
|
git mv sub ./-sub &&
|
|
git commit -m submodule
|
|
'
|
|
|
|
test_expect_success 'clone rejects unprotected dash' '
|
|
test_when_finished "rm -rf dst" &&
|
|
git clone --recurse-submodules . dst 2>err &&
|
|
test_grep ignoring err
|
|
'
|
|
|
|
test_expect_success 'fsck rejects unprotected dash' '
|
|
test_when_finished "rm -rf dst" &&
|
|
git init --bare dst &&
|
|
git -C dst config transfer.fsckObjects true &&
|
|
test_must_fail git push dst HEAD 2>err &&
|
|
grep gitmodulesPath err
|
|
'
|
|
|
|
test_expect_success MINGW 'submodule paths disallows trailing spaces' '
|
|
git init super &&
|
|
test_must_fail git -C super submodule add ../upstream "sub " &&
|
|
|
|
: add "sub", then rename "sub" to "sub ", the hard way &&
|
|
git -C super submodule add ../upstream sub &&
|
|
tree=$(git -C super write-tree) &&
|
|
git -C super ls-tree $tree >tree &&
|
|
sed "s/sub/sub /" <tree >tree.new &&
|
|
tree=$(git -C super mktree <tree.new) &&
|
|
commit=$(echo with space | git -C super commit-tree $tree) &&
|
|
git -C super update-ref refs/heads/main $commit &&
|
|
|
|
test_must_fail git clone --recurse-submodules super dst 2>err &&
|
|
test_grep "sub " err
|
|
'
|
|
|
|
test_done
|