diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-10-31 08:23:30 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 11:13:44 +0300 |
commit | 6789275d3780bcb950e6be8557aeedf160d4ad6d (patch) | |
tree | 24c1fcc6ee63c63284e507b05e3332eb6f6d5537 /t/t7800-difftool.sh | |
parent | 2e87fca189e613912b085c5140312b1f4b3f2977 (diff) |
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/t7800-difftool.sh')
-rwxr-xr-x | t/t7800-difftool.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 59d3847bf8..6a36be1e63 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -28,14 +28,14 @@ prompt_given () test_expect_success 'basic usage requires no repo' ' test_expect_code 129 git difftool -h >output && - test_i18ngrep ^usage: output && + test_grep ^usage: output && # create a ceiling directory to prevent Git from finding a repo mkdir -p not/repo && test_when_finished rm -r not && test_expect_code 129 \ env GIT_CEILING_DIRECTORIES="$(pwd)/not" \ git -C not/repo difftool -h >output && - test_i18ngrep ^usage: output + test_grep ^usage: output ' # Create a file on main and change it on branch |