summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-17 21:07:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-17 21:07:45 (GMT)
commita6711ed714d5312ebe495b026ce66f6b2ae890e2 (patch)
tree3926aa758929d72d054ca3a48a025de0ea150ba6
parent7c5543115edf58b3b9b188f6f1377660bec10629 (diff)
parent3126732e399a8e1766381613a613633d62f21c9b (diff)
downloadgit-a6711ed714d5312ebe495b026ce66f6b2ae890e2.zip
git-a6711ed714d5312ebe495b026ce66f6b2ae890e2.tar.gz
git-a6711ed714d5312ebe495b026ce66f6b2ae890e2.tar.bz2
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
-rwxr-xr-xt/t3404-rebase-interactive.sh2
-rwxr-xr-xt/t5520-pull.sh4
-rwxr-xr-xt/t7411-submodule-config.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 197914b..597e94e 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -1286,7 +1286,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' '
set_fake_editor &&
FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
>out 2>err &&
- grep "$SQ-S\"S I Gner\"$SQ" err
+ test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
'
test_done
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 6ad37b5..5518445 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' '
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index 400e2b1..47562ce 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '
HEAD b \
HEAD submodule \
2>actual_err &&
- grep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
+ test_i18ngrep "submodule-blob $sha1:.gitmodules" actual_err >/dev/null
)
'