diff options
Diffstat (limited to 't/t7110-reset-merge.sh')
| -rwxr-xr-x | t/t7110-reset-merge.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh index 772480a345..61669a2d21 100755 --- a/t/t7110-reset-merge.sh +++ b/t/t7110-reset-merge.sh @@ -5,7 +5,6 @@ test_description='Tests for "git reset" with "--merge" and "--keep" options' -TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success setup ' @@ -238,7 +237,7 @@ test_expect_success '"reset --keep HEAD^" fails with pending merge' ' git reset --hard third && test_must_fail git merge branch1 && test_must_fail git reset --keep HEAD^ 2>err.log && - test_i18ngrep "middle of a merge" err.log + test_grep "middle of a merge" err.log ' # The next test will test the following: @@ -264,7 +263,7 @@ test_expect_success '"reset --keep HEAD" fails with pending merge' ' git reset --hard third && test_must_fail git merge branch1 && test_must_fail git reset --keep HEAD 2>err.log && - test_i18ngrep "middle of a merge" err.log + test_grep "middle of a merge" err.log ' test_expect_success '--merge is ok with added/deleted merge' ' @@ -290,7 +289,7 @@ test_expect_success '--keep fails with added/deleted merge' ' git diff --exit-code file3 && git diff --exit-code branch3 file3 && test_must_fail git reset --keep HEAD 2>err.log && - test_i18ngrep "middle of a merge" err.log + test_grep "middle of a merge" err.log ' test_done |