{"thread":{"id":"43794","subject":"[PATCH 1/3] t3404: become resilient to GETTEXT_POISON","startedAt":"2016-08-12T12:00:20Z","lastAt":"2016-08-17T12:56:16Z","messageCount":4,"participants":["Vasco Almeida","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"298833","messageId":"1471003142-1739-1-git-send-email-vascomalmeida@sapo.pt","threadId":"43794","inReplyTo":null,"subject":"[PATCH 1/3] t3404: become resilient to GETTEXT_POISON","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-08-12T11:59:00Z","receivedAt":"2016-08-12T12:00:20Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"The concerned test greps the output of exit_with_patch() in\ngit-rebase--interactive.sh script.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n t/t3404-rebase-interactive.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 197914b..597e94e 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -1286,7 +1286,7 @@ test_expect_success 'rebase -i --gpg-sign=<key-id>' '\n \tset_fake_editor &&\n \tFAKE_LINES=\"edit 1\" git rebase -i --gpg-sign=\"\\\"S I Gner\\\"\" HEAD^ \\\n \t\t>out 2>err &&\n-\tgrep \"$SQ-S\\\"S I Gner\\\"$SQ\" err\n+\ttest_i18ngrep \"$SQ-S\\\"S I Gner\\\"$SQ\" err\n '\n \n test_done\n-- \n2.7.4\n\n"},{"id":"298834","messageId":"1471003142-1739-2-git-send-email-vascomalmeida@sapo.pt","threadId":"43794","inReplyTo":"1471003142-1739-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 2/3] t5520: become resilient to GETTEXT_POISON","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-08-12T11:59:01Z","receivedAt":"2016-08-12T12:00:23Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Use test_i18ngrep function instead of grep for grepping strings.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n t/t5520-pull.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t5520-pull.sh b/t/t5520-pull.sh\nindex 6ad37b5..5518445 100755\n--- a/t/t5520-pull.sh\n+++ b/t/t5520-pull.sh\n@@ -270,7 +270,7 @@ test_expect_success '--rebase with conflicts shows advice' '\n \ttest_tick &&\n \tgit commit -m \"Create conflict\" seq.txt &&\n \ttest_must_fail git pull --rebase . seq 2>err >out &&\n-\tgrep \"When you have resolved this problem\" out\n+\ttest_i18ngrep \"When you have resolved this problem\" out\n '\n \n test_expect_success 'failed --rebase shows advice' '\n@@ -284,7 +284,7 @@ test_expect_success 'failed --rebase shows advice' '\n \tgit checkout -f -b fails-to-rebase HEAD^ &&\n \ttest_commit v2-without-cr file \"2\" file2-lf &&\n \ttest_must_fail git pull --rebase . diverging 2>err >out &&\n-\tgrep \"When you have resolved this problem\" out\n+\ttest_i18ngrep \"When you have resolved this problem\" out\n '\n \n test_expect_success '--rebase fails with multiple branches' '\n-- \n2.7.4\n\n"},{"id":"298835","messageId":"1471003142-1739-3-git-send-email-vascomalmeida@sapo.pt","threadId":"43794","inReplyTo":"1471003142-1739-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 3/3] t7411: become resilient to GETTEXT_POISON","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-08-12T11:59:02Z","receivedAt":"2016-08-12T12:00:32Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"The concerned test greps the error message in git_parse_source() which\ncontains \"bad config line %d in submodule-blob %s\".\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n t/t7411-submodule-config.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh\nindex 400e2b1..47562ce 100755\n--- a/t/t7411-submodule-config.sh\n+++ b/t/t7411-submodule-config.sh\n@@ -89,7 +89,7 @@ test_expect_success 'error message contains blob reference' '\n \t\t\tHEAD b \\\n \t\t\tHEAD submodule \\\n \t\t\t\t2>actual_err &&\n-\t\tgrep \"submodule-blob $sha1:.gitmodules\" actual_err >/dev/null\n+\t\ttest_i18ngrep \"submodule-blob $sha1:.gitmodules\" actual_err >/dev/null\n \t)\n '\n \n-- \n2.7.4\n\n"},{"id":"299543","messageId":"alpine.DEB.2.20.1608171448060.4924@virtualbox","threadId":"43794","inReplyTo":"1471003142-1739-1-git-send-email-vascomalmeida@sapo.pt","subject":"Re: [PATCH 1/3] t3404: become resilient to GETTEXT_POISON","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2016-08-17T12:49:30Z","receivedAt":"2016-08-17T12:56:16Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Vasco,\n\nOn Fri, 12 Aug 2016, Vasco Almeida wrote:\n\n> The concerned test greps the output of exit_with_patch() in\n> git-rebase--interactive.sh script.\n> \n> Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n\nThank you for keeping an eye out for these issues. I have to admit that I\nam a bit confused when to use i18ngrep and when not, so it is good to know\nthat my mistakes won't survive for long!\n\nCiao,\nDscho\n"}]}