{"thread":{"id":"45923","subject":"t6134 test failure in 'pu'","startedAt":"2017-05-10T16:14:40Z","lastAt":"2017-05-11T00:21:49Z","messageCount":2,"participants":["Ramsay Jones","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"319276","messageId":"361a3331-4d48-9ad3-42d4-3bf4b97dca22@ramsayjones.plus.com","threadId":"45923","inReplyTo":null,"subject":"t6134 test failure in 'pu'","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2017-05-10T16:14:32Z","receivedAt":"2017-05-10T16:14:40Z","isPatch":false,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"Hi Junio,\n\nt6134 fails for me in 'pu', but I think it is just a question\nof merge 641f3ad90a3 dropping the last line of the test from\nthe change introduced by commit bdab972153.\n\nIn other words, this fixes the test for me:\n\n$ git diff\ndiff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh\nindex 6d5df294a..c67066840 100755\n--- a/t/t6134-pathspec-in-submodule.sh\n+++ b/t/t6134-pathspec-in-submodule.sh\n@@ -26,6 +26,7 @@ test_expect_success 'error message for path inside submodule' '\n \n test_expect_success 'error message for path inside submodule from within submodule' '\n        test_must_fail git -C sub add . 2>actual &&\n+       test_i18ngrep \"in unpopulated submodule\" actual\n '\n \n test_done\n$ \n\nThanks!\n\nATB,\nRamsay Jones\n\n"},{"id":"319306","messageId":"xmqqwp9ow8dn.fsf@gitster.mtv.corp.google.com","threadId":"45923","inReplyTo":"361a3331-4d48-9ad3-42d4-3bf4b97dca22@ramsayjones.plus.com","subject":"Re: t6134 test failure in 'pu'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-05-11T00:21:40Z","receivedAt":"2017-05-11T00:21:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks for a quick report.  Yes, that was a stupid mismerge.\n\nWill correct in my rerere database X-<.\n"}]}