summaryrefslogtreecommitdiff
path: root/t/t3402-rebase-merge.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-31 05:23:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2023-11-02 08:13:44 (GMT)
commit6789275d3780bcb950e6be8557aeedf160d4ad6d (patch)
tree24c1fcc6ee63c63284e507b05e3332eb6f6d5537 /t/t3402-rebase-merge.sh
parent2e87fca189e613912b085c5140312b1f4b3f2977 (diff)
downloadgit-6789275d3780bcb950e6be8557aeedf160d4ad6d.zip
git-6789275d3780bcb950e6be8557aeedf160d4ad6d.tar.gz
git-6789275d3780bcb950e6be8557aeedf160d4ad6d.tar.bz2
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>
Diffstat (limited to 't/t3402-rebase-merge.sh')
-rwxr-xr-xt/t3402-rebase-merge.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index e9e03ca..5c67d07 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -171,7 +171,7 @@ test_expect_success '--reapply-cherry-picks' '
# Regular rebase fails, because the 1-11 commit is deduplicated
test_must_fail git -C repo rebase --merge main 2> err &&
- test_i18ngrep "error: could not apply.*add 12 in another branch" err &&
+ test_grep "error: could not apply.*add 12 in another branch" err &&
git -C repo rebase --abort &&
# With --reapply-cherry-picks, it works