diff options
| author | Vasco Almeida <vascomalmeida@sapo.pt> | 2016-08-12 11:59:01 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-12 15:12:33 -0700 |
| commit | 0955ab465430d15ad71208654370f511cfd4815c (patch) | |
| tree | ec2a43ffd4657e22d51163139038c4f7b5cca0d9 /t/t5520-pull.sh | |
| parent | 7ca79dca0628a8b375ff0fdff2ed04471a32e921 (diff) | |
| download | git-0955ab465430d15ad71208654370f511cfd4815c.tar.gz | |
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>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 6ad37b5f66..551844584f 100755 --- 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 && - 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' ' |