t5520: become resilient to GETTEXT_POISON

Use test_i18ngrep function instead of grep for grepping strings.

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 6ad37b5f6616d1423436dfa56a41da73b88f8bcf..551844584fc7b8ff71667dd61fcba62889ded69f 100755 (executable)
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -270,7 +270,7 @@ test_expect_success '--rebase with conflicts shows advice' '
        test_tick &&
        git commit -m "Create conflict" seq.txt &&
        test_must_fail git pull --rebase . seq 2>err >out &&
        test_tick &&
        git commit -m "Create conflict" seq.txt &&
        test_must_fail git pull --rebase . seq 2>err >out &&

-       grep "When you have resolved this problem" out
+       test_i18ngrep "When you have resolved this problem" out

 '
 
 test_expect_success 'failed --rebase shows advice' '
 '
 
 test_expect_success 'failed --rebase shows advice' '


@@ -284,7 +284,7 @@ test_expect_success 'failed --rebase shows advice' '
        git checkout -f -b fails-to-rebase HEAD^ &&
        test_commit v2-without-cr file "2" file2-lf &&
        test_must_fail git pull --rebase . diverging 2>err >out &&
        git checkout -f -b fails-to-rebase HEAD^ &&
        test_commit v2-without-cr file "2" file2-lf &&
        test_must_fail git pull --rebase . diverging 2>err >out &&

-       grep "When you have resolved this problem" out
+       test_i18ngrep "When you have resolved this problem" out

 '
 
 test_expect_success '--rebase fails with multiple branches' '
 '
 
 test_expect_success '--rebase fails with multiple branches' '