From 7ca79dca0628a8b375ff0fdff2ed04471a32e921 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 12 Aug 2016 11:59:00 +0000 Subject: t3404: become resilient to GETTEXT_POISON The concerned test greps the output of exit_with_patch() in git-rebase--interactive.sh script. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano 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=' ' 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 -- cgit v0.10.2-6-g49f6 From 0955ab465430d15ad71208654370f511cfd4815c Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 12 Aug 2016 11:59:01 +0000 Subject: t5520: become resilient to GETTEXT_POISON Use test_i18ngrep function instead of grep for grepping strings. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano 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' ' -- cgit v0.10.2-6-g49f6 From 3126732e399a8e1766381613a613633d62f21c9b Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 12 Aug 2016 11:59:02 +0000 Subject: t7411: become resilient to GETTEXT_POISON The concerned test greps the error message in git_parse_source() which contains "bad config line %d in submodule-blob %s". Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano 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 ) ' -- cgit v0.10.2-6-g49f6