i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 7be2ff38fc92088d4caff9ea13b1d78a1b040b40..f1cfc9ac959ee281d50f7b8a51fdcefd2d0670e7 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -423,10 +423,10 @@ Unstaged changes after reset:
 M      file2
 EOF
 
 M      file2
 EOF
 

-test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
+test_expect_success '--mixed refreshes the index' '

        echo 123 >> file2 &&
        git reset --mixed HEAD > output &&
        echo 123 >> file2 &&
        git reset --mixed HEAD > output &&

-       test_cmp expect output
+       test_i18ncmp expect output

 '
 
 test_expect_success 'disambiguation (1)' '
 '
 
 test_expect_success 'disambiguation (1)' '

diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index b42820ad6976590fe195637d5e85d1b4db963cda..a82a07a04a8500cdac2cfb7ef39fb3f5981f437f 100755 (executable)
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -233,11 +233,11 @@ test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
 #           working index HEAD target         working index HEAD
 #           ----------------------------------------------------
 # file1:     X       U     B    C     --keep   (disallowed)
 #           working index HEAD target         working index HEAD
 #           ----------------------------------------------------
 # file1:     X       U     B    C     --keep   (disallowed)

-test_expect_success C_LOCALE_OUTPUT '"reset --keep HEAD^" fails with pending merge' '
+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 &&
     git reset --hard third &&
     test_must_fail git merge branch1 &&
     test_must_fail git reset --keep HEAD^ 2>err.log &&

-    grep "middle of a merge" err.log
+    test_i18ngrep "middle of a merge" err.log

 '
 
 # The next test will test the following:
 '
 
 # The next test will test the following:


@@ -259,11 +259,11 @@ test_expect_success '"reset --merge HEAD" is ok with pending merge' '
 #           working index HEAD target         working index HEAD
 #           ----------------------------------------------------
 # file1:     X       U     B    B     --keep   (disallowed)
 #           working index HEAD target         working index HEAD
 #           ----------------------------------------------------
 # file1:     X       U     B    B     --keep   (disallowed)

-test_expect_success C_LOCALE_OUTPUT '"reset --keep HEAD" fails with pending merge' '
+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 &&
     git reset --hard third &&
     test_must_fail git merge branch1 &&
     test_must_fail git reset --keep HEAD 2>err.log &&

-    grep "middle of a merge" err.log
+    test_i18ngrep "middle of a merge" err.log

 '
 
 test_expect_success '--merge is ok with added/deleted merge' '
 '
 
 test_expect_success '--merge is ok with added/deleted merge' '


@@ -280,7 +280,7 @@ test_expect_success '--merge is ok with added/deleted merge' '
     git diff --exit-code --cached
 '
 
     git diff --exit-code --cached
 '
 

-test_expect_success C_LOCALE_OUTPUT '--keep fails with added/deleted merge' '
+test_expect_success '--keep fails with added/deleted merge' '

     git reset --hard third &&
     rm -f file2 &&
     test_must_fail git merge branch3 &&
     git reset --hard third &&
     rm -f file2 &&
     test_must_fail git merge branch3 &&


@@ -289,7 +289,7 @@ test_expect_success C_LOCALE_OUTPUT '--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 &&
     git diff --exit-code file3 &&
     git diff --exit-code branch3 file3 &&
     test_must_fail git reset --keep HEAD 2>err.log &&

-    grep "middle of a merge" err.log
+    test_i18ngrep "middle of a merge" err.log

 '
 
 test_done
 '
 
 test_done