diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 11:04:02 +0900 |
| commit | a8e2394704d0543f4e1f1ac6ea532d098316d97e (patch) | |
| tree | 9120b53b6c93bb8db02997cb446a4311a7e21311 /t/t3007-ls-files-recurse-submodules.sh | |
| parent | ca320b256c07157f66aad5e7d23a3b71de6952d5 (diff) | |
| parent | 6789275d3780bcb950e6be8557aeedf160d4ad6d (diff) | |
| download | git-a8e2394704d0543f4e1f1ac6ea532d098316d97e.tar.gz | |
Merge branch 'jc/test-i18ngrep'
Another step to deprecate test_i18ngrep.
* jc/test-i18ngrep:
tests: teach callers of test_i18ngrep to use test_grep
test framework: further deprecate test_i18ngrep
Diffstat (limited to 't/t3007-ls-files-recurse-submodules.sh')
| -rwxr-xr-x | t/t3007-ls-files-recurse-submodules.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh index 7308a3d4e2..61771eec83 100755 --- a/t/t3007-ls-files-recurse-submodules.sh +++ b/t/t3007-ls-files-recurse-submodules.sh @@ -296,7 +296,7 @@ test_expect_success '--recurse-submodules and relative paths' ' test_expect_success '--recurse-submodules does not support --error-unmatch' ' test_must_fail git ls-files --recurse-submodules --error-unmatch 2>actual && - test_i18ngrep "does not support --error-unmatch" actual + test_grep "does not support --error-unmatch" actual ' test_expect_success '--recurse-submodules parses submodule repo config' ' @@ -335,7 +335,7 @@ test_expect_success '--recurse-submodules submodules ignore super project worktr test_incompatible_with_recurse_submodules () { test_expect_success "--recurse-submodules and $1 are incompatible" " test_must_fail git ls-files --recurse-submodules $1 2>actual && - test_i18ngrep 'unsupported mode' actual + test_grep 'unsupported mode' actual " } |