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>
Vasco Almeida committed
Aug 12, 2016 at 11:59 UTC
0955ab465430d15ad71208654370f511cfd4815c
1 file changed
+2
-2
t/t5520-pull.sh
+2
-2
@@ -270,7 +270,7 @@ test_expect_success '--rebase with conflicts shows advice' '
270
test_tick &&
271
git commit -m "Create conflict" seq.txt &&
272
test_must_fail git pull --rebase . seq 2>err >out &&
273
- grep "When you have resolved this problem" out
273
+ test_i18ngrep "When you have resolved this problem" out
274
'
275
276
test_expect_success 'failed --rebase shows advice' '
@@ -284,7 +284,7 @@ test_expect_success 'failed --rebase shows advice' '
284
git checkout -f -b fails-to-rebase HEAD^ &&
285
test_commit v2-without-cr file "2" file2-lf &&
286
test_must_fail git pull --rebase . diverging 2>err >out &&
287
- grep "When you have resolved this problem" out
287
+ test_i18ngrep "When you have resolved this problem" out
288
'
289
290
test_expect_success '--rebase fails with multiple branches' '