i18n: use test_i18ngrep in t7506

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

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index c56733253fe335af9cbd12d19e776e35bd335994..c8d50a65672fdc00ccb42e6b7cece44b255623f1 100755 (executable)
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -20,21 +20,21 @@ test_expect_success 'setup' '
        git commit -m "Add submodule sub"
 '
 
        git commit -m "Add submodule sub"
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status clean' '
+test_expect_success 'status clean' '

        git status >output &&
        git status >output &&

-       grep "nothing to commit" output
+       test_i18ngrep "nothing to commit" output

 '
 
 '
 

-test_expect_success C_LOCALE_OUTPUT 'commit --dry-run -a clean' '
+test_expect_success 'commit --dry-run -a clean' '

        test_must_fail git commit --dry-run -a >output &&
        test_must_fail git commit --dry-run -a >output &&

-       grep "nothing to commit" output
+       test_i18ngrep "nothing to commit" output

 '
 
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with modified file in submodule' '
+test_expect_success 'status with modified file in submodule' '

        (cd sub && git reset --hard) &&
        echo "changed" >sub/foo &&
        git status >output &&
        (cd sub && git reset --hard) &&
        echo "changed" >sub/foo &&
        git status >output &&

-       grep "modified:   sub (modified content)" output
+       test_i18ngrep "modified:   sub (modified content)" output

 '
 
 test_expect_success 'status with modified file in submodule (porcelain)' '
 '
 
 test_expect_success 'status with modified file in submodule (porcelain)' '


@@ -46,10 +46,10 @@ test_expect_success 'status with modified file in submodule (porcelain)' '
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with added file in submodule' '
+test_expect_success 'status with added file in submodule' '

        (cd sub && git reset --hard && echo >foo && git add foo) &&
        git status >output &&
        (cd sub && git reset --hard && echo >foo && git add foo) &&
        git status >output &&

-       grep "modified:   sub (modified content)" output
+       test_i18ngrep "modified:   sub (modified content)" output

 '
 
 test_expect_success 'status with added file in submodule (porcelain)' '
 '
 
 test_expect_success 'status with added file in submodule (porcelain)' '


@@ -60,16 +60,16 @@ test_expect_success 'status with added file in submodule (porcelain)' '
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with untracked file in submodule' '
+test_expect_success 'status with untracked file in submodule' '

        (cd sub && git reset --hard) &&
        echo "content" >sub/new-file &&
        git status >output &&
        (cd sub && git reset --hard) &&
        echo "content" >sub/new-file &&
        git status >output &&

-       grep "modified:   sub (untracked content)" output
+       test_i18ngrep "modified:   sub (untracked content)" output

 '
 
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status -uno with untracked file in submodule' '
+test_expect_success 'status -uno with untracked file in submodule' '

        git status -uno >output &&
        git status -uno >output &&

-       grep "^nothing to commit" output
+       test_i18ngrep "^nothing to commit" output

 '
 
 test_expect_success 'status with untracked file in submodule (porcelain)' '
 '
 
 test_expect_success 'status with untracked file in submodule (porcelain)' '


@@ -79,11 +79,11 @@ test_expect_success 'status with untracked file in submodule (porcelain)' '
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with added and untracked file in submodule' '
+test_expect_success 'status with added and untracked file in submodule' '

        (cd sub && git reset --hard && echo >foo && git add foo) &&
        echo "content" >sub/new-file &&
        git status >output &&
        (cd sub && git reset --hard && echo >foo && git add foo) &&
        echo "content" >sub/new-file &&
        git status >output &&

-       grep "modified:   sub (modified content, untracked content)" output
+       test_i18ngrep "modified:   sub (modified content, untracked content)" output

 '
 
 test_expect_success 'status with added and untracked file in submodule (porcelain)' '
 '
 
 test_expect_success 'status with added and untracked file in submodule (porcelain)' '


@@ -95,13 +95,13 @@ test_expect_success 'status with added and untracked file in submodule (porcelai
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with modified file in modified submodule' '
+test_expect_success 'status with modified file in modified submodule' '

        (cd sub && git reset --hard) &&
        rm sub/new-file &&
        (cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
        echo "changed" >sub/foo &&
        git status >output &&
        (cd sub && git reset --hard) &&
        rm sub/new-file &&
        (cd sub && echo "next change" >foo && git commit -m "next change" foo) &&
        echo "changed" >sub/foo &&
        git status >output &&

-       grep "modified:   sub (new commits, modified content)" output
+       test_i18ngrep "modified:   sub (new commits, modified content)" output

 '
 
 test_expect_success 'status with modified file in modified submodule (porcelain)' '
 '
 
 test_expect_success 'status with modified file in modified submodule (porcelain)' '


@@ -113,10 +113,10 @@ test_expect_success 'status with modified file in modified submodule (porcelain)
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with added file in modified submodule' '
+test_expect_success 'status with added file in modified submodule' '

        (cd sub && git reset --hard && echo >foo && git add foo) &&
        git status >output &&
        (cd sub && git reset --hard && echo >foo && git add foo) &&
        git status >output &&

-       grep "modified:   sub (new commits, modified content)" output
+       test_i18ngrep "modified:   sub (new commits, modified content)" output

 '
 
 test_expect_success 'status with added file in modified submodule (porcelain)' '
 '
 
 test_expect_success 'status with added file in modified submodule (porcelain)' '


@@ -127,11 +127,11 @@ test_expect_success 'status with added file in modified submodule (porcelain)' '
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with untracked file in modified submodule' '
+test_expect_success 'status with untracked file in modified submodule' '

        (cd sub && git reset --hard) &&
        echo "content" >sub/new-file &&
        git status >output &&
        (cd sub && git reset --hard) &&
        echo "content" >sub/new-file &&
        git status >output &&

-       grep "modified:   sub (new commits, untracked content)" output
+       test_i18ngrep "modified:   sub (new commits, untracked content)" output

 '
 
 test_expect_success 'status with untracked file in modified submodule (porcelain)' '
 '
 
 test_expect_success 'status with untracked file in modified submodule (porcelain)' '


@@ -141,11 +141,11 @@ test_expect_success 'status with untracked file in modified submodule (porcelain
        EOF
 '
 
        EOF
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with added and untracked file in modified submodule' '
+test_expect_success 'status with added and untracked file in modified submodule' '

        (cd sub && git reset --hard && echo >foo && git add foo) &&
        echo "content" >sub/new-file &&
        git status >output &&
        (cd sub && git reset --hard && echo >foo && git add foo) &&
        echo "content" >sub/new-file &&
        git status >output &&

-       grep "modified:   sub (new commits, modified content, untracked content)" output
+       test_i18ngrep "modified:   sub (new commits, modified content, untracked content)" output

 '
 
 test_expect_success 'status with added and untracked file in modified submodule (porcelain)' '
 '
 
 test_expect_success 'status with added and untracked file in modified submodule (porcelain)' '


@@ -167,24 +167,24 @@ test_expect_success 'setup .git file for sub' '
         git commit -m "added .real to .gitignore" .gitignore
 '
 
         git commit -m "added .real to .gitignore" .gitignore
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status with added file in modified submodule with .git file' '
+test_expect_success 'status with added file in modified submodule with .git file' '

        (cd sub && git reset --hard && echo >foo && git add foo) &&
        git status >output &&
        (cd sub && git reset --hard && echo >foo && git add foo) &&
        git status >output &&

-       grep "modified:   sub (new commits, modified content)" output
+       test_i18ngrep "modified:   sub (new commits, modified content)" output

 '
 
 test_expect_success 'rm submodule contents' '
        rm -rf sub/* sub/.git
 '
 
 '
 
 test_expect_success 'rm submodule contents' '
        rm -rf sub/* sub/.git
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status clean (empty submodule dir)' '
+test_expect_success 'status clean (empty submodule dir)' '

        git status >output &&
        git status >output &&

-       grep "nothing to commit" output
+       test_i18ngrep "nothing to commit" output

 '
 
 '
 

-test_expect_success C_LOCALE_OUTPUT 'status -a clean (empty submodule dir)' '
+test_expect_success 'status -a clean (empty submodule dir)' '

        test_must_fail git commit --dry-run -a >output &&
        test_must_fail git commit --dry-run -a >output &&

-       grep "nothing to commit" output
+       test_i18ngrep "nothing to commit" output

 '
 
 test_done
 '
 
 test_done