tests: teach callers of test_i18ngrep to use test_grep
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>
This commit is contained in:
@ -177,7 +177,7 @@ test_expect_success 'pull --rebase --recurse-submodules fails if both sides reco
|
||||
# submodule itself, but the merge strategy in submodules
|
||||
# does not support rebase:
|
||||
test_must_fail git -C super pull --rebase --recurse-submodules 2>err &&
|
||||
test_i18ngrep "locally recorded submodule modifications" err
|
||||
test_grep "locally recorded submodule modifications" err
|
||||
'
|
||||
|
||||
test_expect_success 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)' '
|
||||
|
Reference in New Issue
Block a user