From 6789275d3780bcb950e6be8557aeedf160d4ad6d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 31 Oct 2023 14:23:30 +0900 Subject: 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 --- t/t2107-update-index-basic.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 't/t2107-update-index-basic.sh') diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh index 89b285fa3a..3d7ca5792e 100755 --- a/t/t2107-update-index-basic.sh +++ b/t/t2107-update-index-basic.sh @@ -14,7 +14,7 @@ test_expect_success 'update-index --nonsense fails' ' test_expect_success 'update-index --nonsense dumps usage' ' test_expect_code 129 git update-index --nonsense 2>err && - test_i18ngrep "[Uu]sage: git update-index" err + test_grep "[Uu]sage: git update-index" err ' test_expect_success 'update-index -h with corrupt index' ' @@ -25,7 +25,7 @@ test_expect_success 'update-index -h with corrupt index' ' >.git/index && test_expect_code 129 git update-index -h >usage 2>&1 ) && - test_i18ngrep "[Uu]sage: git update-index" broken/usage + test_grep "[Uu]sage: git update-index" broken/usage ' test_expect_success '--cacheinfo complains of missing arguments' ' -- cgit v1.3