mirror of
https://github.com/git/git
synced 2024-07-17 11:07:55 +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>
146 lines
3.7 KiB
Bash
Executable file
146 lines
3.7 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='magic pathspec tests using git-log'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit initial &&
|
|
test_tick &&
|
|
git commit --allow-empty -m empty &&
|
|
mkdir sub
|
|
'
|
|
|
|
test_expect_success '"git log :/" should not be ambiguous' '
|
|
git log :/
|
|
'
|
|
|
|
test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' '
|
|
: >a &&
|
|
test_must_fail git log :/a 2>error &&
|
|
test_grep ambiguous error
|
|
'
|
|
|
|
test_expect_success '"git log :/a -- " should not be ambiguous' '
|
|
git log :/a --
|
|
'
|
|
|
|
test_expect_success '"git log :/detached -- " should find a commit only in HEAD' '
|
|
test_when_finished "git checkout main" &&
|
|
git checkout --detach &&
|
|
test_commit --no-tag detached &&
|
|
test_commit --no-tag something-else &&
|
|
git log :/detached --
|
|
'
|
|
|
|
test_expect_success '"git log :/detached -- " should not find an orphaned commit' '
|
|
test_must_fail git log :/detached --
|
|
'
|
|
|
|
test_expect_success '"git log :/detached -- " should find HEAD only of own worktree' '
|
|
git worktree add other-tree HEAD &&
|
|
git -C other-tree checkout --detach &&
|
|
test_tick &&
|
|
git -C other-tree commit --allow-empty -m other-detached &&
|
|
git -C other-tree log :/other-detached -- &&
|
|
test_must_fail git log :/other-detached --
|
|
'
|
|
|
|
test_expect_success '"git log -- :/a" should not be ambiguous' '
|
|
git log -- :/a
|
|
'
|
|
|
|
test_expect_success '"git log :/any/path/" should not segfault' '
|
|
test_must_fail git log :/any/path/
|
|
'
|
|
|
|
# This differs from the ":/a" check above in that :/in looks like a pathspec,
|
|
# but doesn't match an actual file.
|
|
test_expect_success '"git log :/in" should not be ambiguous' '
|
|
git log :/in
|
|
'
|
|
|
|
test_expect_success '"git log :" should be ambiguous' '
|
|
test_must_fail git log : 2>error &&
|
|
test_grep ambiguous error
|
|
'
|
|
|
|
test_expect_success 'git log -- :' '
|
|
git log -- :
|
|
'
|
|
|
|
test_expect_success 'git log HEAD -- :/' '
|
|
initial=$(git rev-parse --short HEAD^) &&
|
|
cat >expected <<-EOF &&
|
|
$initial initial
|
|
EOF
|
|
(cd sub && git log --oneline HEAD -- :/ >../actual) &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success '"git log :^sub" is not ambiguous' '
|
|
git log :^sub
|
|
'
|
|
|
|
test_expect_success '"git log :^does-not-exist" does not match anything' '
|
|
test_must_fail git log :^does-not-exist
|
|
'
|
|
|
|
test_expect_success '"git log :!" behaves the same as :^' '
|
|
git log :!sub &&
|
|
test_must_fail git log :!does-not-exist
|
|
'
|
|
|
|
test_expect_success '"git log :(exclude)sub" is not ambiguous' '
|
|
git log ":(exclude)sub"
|
|
'
|
|
|
|
test_expect_success '"git log :(exclude)sub --" must resolve as an object' '
|
|
test_must_fail git log ":(exclude)sub" --
|
|
'
|
|
|
|
test_expect_success '"git log :(unknown-magic) complains of bogus magic' '
|
|
test_must_fail git log ":(unknown-magic)" 2>error &&
|
|
test_grep pathspec.magic error
|
|
'
|
|
|
|
test_expect_success 'command line pathspec parsing for "git log"' '
|
|
git reset --hard &&
|
|
>a &&
|
|
git add a &&
|
|
git commit -m "add an empty a" --allow-empty &&
|
|
echo 1 >a &&
|
|
git commit -a -m "update a to 1" &&
|
|
git checkout HEAD^ &&
|
|
echo 2 >a &&
|
|
git commit -a -m "update a to 2" &&
|
|
test_must_fail git merge main &&
|
|
git add a &&
|
|
git log --merge -- a
|
|
'
|
|
|
|
test_expect_success 'tree_entry_interesting does not match past submodule boundaries' '
|
|
test_when_finished "rm -rf repo submodule" &&
|
|
test_config_global protocol.file.allow always &&
|
|
git init submodule &&
|
|
test_commit -C submodule initial &&
|
|
git init repo &&
|
|
>"repo/[bracket]" &&
|
|
git -C repo add "[bracket]" &&
|
|
test_tick &&
|
|
git -C repo commit -m bracket &&
|
|
git -C repo rev-list HEAD -- "[bracket]" >expect &&
|
|
|
|
git -C repo submodule add ../submodule &&
|
|
test_tick &&
|
|
git -C repo commit -m submodule &&
|
|
|
|
git -C repo rev-list HEAD -- "[bracket]" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|