{"thread":{"id":"47809","subject":"[PATCH 0/2] test_i18ngrep","startedAt":"2018-02-12T00:16:36Z","lastAt":"2018-02-12T00:16:36Z","messageCount":1,"participants":["Ramsay Jones"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"339024","messageId":"27cb6114-2aa7-c2cc-c3dc-4ac4e318d5f7@ramsayjones.plus.com","threadId":"47809","inReplyTo":null,"subject":"[PATCH 0/2] test_i18ngrep","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2018-02-12T00:16:28Z","receivedAt":"2018-02-12T00:16:36Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nThese patches resulted from an experiment of yours [1], I wrote these up\nlast year, then promptly forgot about them! ;-)\n\nThese patches were built on top of v2.16, and the second patch has a simple\nconflict with commit 93b4b0313c (\"t5536: let 'test_i18ngrep' read the file\nwithout redirection\", 2018-02-08), which is in the 'next' branch.\n\nThe conflict looks like so:\n\n  $ git diff\n  diff --cc t/t5536-fetch-conflicts.sh\n  index 644736b8a,38381df5e..000000000\n  --- a/t/t5536-fetch-conflicts.sh\n  +++ b/t/t5536-fetch-conflicts.sh\n  @@@ -22,7 -22,7 +22,11 @@@ verify_stderr () \n          cat >expected &&\n          # We're not interested in the error\n          # \"fatal: The remote end hung up unexpectedly\":\n  ++<<<<<<< HEAD\n   +      test_i18ngrep -E '^(fatal|warning):' error | grep -v 'hung up' >actual | sort &&\n  ++=======\n  +       grep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual &&\n  ++>>>>>>> master-i18n\n          test_i18ncmp expected actual\n    }\n    \n  $ \n  \nThe resolution is to simply take the 'master-i18n' text. However, if you\nprefer, I can rebuild these patches on top of 'next' and re-submit. Just\nlet me know.\n\nNote that I replaced an 'test_i18ngrep -E' with 'grep -E' rather than egrep.\n(the grep man page claims that egrep, fgrep and rgrep are deprecated, but I\nthink that has been the case for as long as I can remember, so don't hold\nyour breath!).\n\n[1] https://public-inbox.org/git/%3Cxmqqvahawirr.fsf@gitster.mtv.corp.google.com%3E/\n\nRamsay Jones (2):\n  t4151: consolidate multiple calls to test_i18ngrep\n  t5556: replace test_i18ngrep with a simple grep\n\n t/t4151-am-abort.sh        | 5 ++---\n t/t5536-fetch-conflicts.sh | 2 +-\n 2 files changed, 3 insertions(+), 4 deletions(-)\n\n-- \n2.16.0\n"}]}