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>
28 lines
666 B
Bash
Executable file
28 lines
666 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Merge-recursive rename/delete conflict message'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'rename/delete' '
|
|
echo foo >A &&
|
|
git add A &&
|
|
git commit -m "initial" &&
|
|
|
|
git checkout -b rename &&
|
|
git mv A B &&
|
|
git commit -m "rename" &&
|
|
|
|
git checkout main &&
|
|
git rm A &&
|
|
git commit -m "delete" &&
|
|
|
|
test_must_fail git merge --strategy=recursive rename >output &&
|
|
test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
|
|
test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
|
|
'
|
|
|
|
test_done
|