undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5520: become resilient to GETTEXT_POISON

Browse Source 
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>
This commit is contained in:
Vasco Almeida 2016-08-12 11:59:01 +00:00 committed by Junio C Hamano
parent 7ca79dca06
commit 0955ab4654
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t5520-pull.sh
View File

@ -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 &&
grep "When you have resolved this problem" out
test_i18ngrep "When you have resolved this problem" out
'
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 &&
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' '