diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-08-17 14:07:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-08-17 14:07:45 -0700 |
| commit | a6711ed714d5312ebe495b026ce66f6b2ae890e2 (patch) | |
| tree | 3926aa758929d72d054ca3a48a025de0ea150ba6 /t/t5520-pull.sh | |
| parent | 7c5543115edf58b3b9b188f6f1377660bec10629 (diff) | |
| parent | 3126732e399a8e1766381613a613633d62f21c9b (diff) | |
| download | git-a6711ed714d5312ebe495b026ce66f6b2ae890e2.tar.gz | |
Merge branch 'va/i18n'
A handful of tests that were broken under gettext-poison build have
been fixed.
* va/i18n:
t7411: become resilient to GETTEXT_POISON
t5520: become resilient to GETTEXT_POISON
t3404: become resilient to GETTEXT_POISON
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' ' |