mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +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>
61 lines
1.5 KiB
Bash
Executable file
61 lines
1.5 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='checkout handling of ambiguous (branch/tag) refs'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup ambiguous refs' '
|
|
test_commit branch file &&
|
|
git branch ambiguity &&
|
|
git branch vagueness &&
|
|
test_commit tag file &&
|
|
git tag ambiguity &&
|
|
git tag vagueness HEAD:file &&
|
|
test_commit other file
|
|
'
|
|
|
|
test_expect_success 'checkout ambiguous ref succeeds' '
|
|
git checkout ambiguity 2>stderr
|
|
'
|
|
|
|
test_expect_success 'checkout produces ambiguity warning' '
|
|
grep "warning.*ambiguous" stderr
|
|
'
|
|
|
|
test_expect_success 'checkout chooses branch over tag' '
|
|
echo refs/heads/ambiguity >expect &&
|
|
git symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual &&
|
|
echo branch >expect &&
|
|
test_cmp expect file
|
|
'
|
|
|
|
test_expect_success 'checkout reports switch to branch' '
|
|
test_grep "Switched to branch" stderr &&
|
|
test_grep ! "^HEAD is now at" stderr
|
|
'
|
|
|
|
test_expect_success 'checkout vague ref succeeds' '
|
|
git checkout vagueness 2>stderr &&
|
|
test_set_prereq VAGUENESS_SUCCESS
|
|
'
|
|
|
|
test_expect_success VAGUENESS_SUCCESS 'checkout produces ambiguity warning' '
|
|
grep "warning.*ambiguous" stderr
|
|
'
|
|
|
|
test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' '
|
|
echo refs/heads/vagueness >expect &&
|
|
git symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual &&
|
|
echo branch >expect &&
|
|
test_cmp expect file
|
|
'
|
|
|
|
test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' '
|
|
test_grep "Switched to branch" stderr &&
|
|
test_grep ! "^HEAD is now at" stderr
|
|
'
|
|
|
|
test_done
|