diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-08 05:04:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-08 05:04:02 +0300 |
| commit | a8e2394704d0543f4e1f1ac6ea532d098316d97e (patch) | |
| tree | 9120b53b6c93bb8db02997cb446a4311a7e21311 /t/t3400-rebase.sh | |
| parent | ca320b256c07157f66aad5e7d23a3b71de6952d5 (diff) | |
| parent | 6789275d3780bcb950e6be8557aeedf160d4ad6d (diff) | |
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/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index d3df19a51f..24a539c662 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -143,8 +143,8 @@ test_expect_success 'Show verbose error when HEAD could not be detached' ' >B && test_when_finished "rm -f B" && test_must_fail git rebase topic 2>output.err >output.out && - test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err && - test_i18ngrep B output.err + test_grep "The following untracked working tree files would be overwritten by checkout:" output.err && + test_grep B output.err ' test_expect_success 'fail when upstream arg is missing and not on branch' ' @@ -421,7 +421,7 @@ test_expect_success 'refuse to switch to branch checked out elsewhere' ' git checkout main && git worktree add wt && test_must_fail git -C wt rebase main main 2>err && - test_i18ngrep "already used by worktree at" err + test_grep "already used by worktree at" err ' test_expect_success MINGW,SYMLINKS_WINDOWS 'rebase when .git/logs is a symlink' ' |