{"thread":{"id":"48868","subject":"[PATCH] t6036: fix broken && chain in sub-shell","startedAt":"2018-07-12T15:32:30Z","lastAt":"2018-07-12T18:48:50Z","messageCount":2,"participants":["Ramsay Jones","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"352348","messageId":"c9201ced-34a8-98f4-2da6-9c36c408b501@ramsayjones.plus.com","threadId":"48868","inReplyTo":null,"subject":"[PATCH] t6036: fix broken && chain in sub-shell","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2018-07-12T15:32:25Z","receivedAt":"2018-07-12T15:32:30Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>\n---\n\nHi Junio,\n\nI had a test failure on 'pu' today - Eric's chain-lint series\nfound another broken chain in one of Elijah's new tests (on the\n'en/t6036-recursive-corner-cases' branch).\n\nATB,\nRamsay Jones\n\n t/t6036-recursive-corner-cases.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh\nindex 2a44acace..59e52c5a0 100755\n--- a/t/t6036-recursive-corner-cases.sh\n+++ b/t/t6036-recursive-corner-cases.sh\n@@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict\n \t\ttest_write_lines 1 2 3 4 5 6 7 8 >a &&\n \t\tgit add a &&\n \t\tgit commit -m E3 &&\n-\t\tgit tag E3\n+\t\tgit tag E3 &&\n \n \t\tgit checkout C^0 &&\n \t\ttest_must_fail git merge B^0 &&\n-- \n2.18.0\n"},{"id":"352383","messageId":"xmqq4lh4xpbm.fsf@gitster-ct.c.googlers.com","threadId":"48868","inReplyTo":"c9201ced-34a8-98f4-2da6-9c36c408b501@ramsayjones.plus.com","subject":"Re: [PATCH] t6036: fix broken && chain in sub-shell","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-12T18:48:45Z","receivedAt":"2018-07-12T18:48:50Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones <ramsay@ramsayjones.plus.com> writes:\n\n> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>\n> ---\n>\n> Hi Junio,\n>\n> I had a test failure on 'pu' today - Eric's chain-lint series\n> found another broken chain in one of Elijah's new tests (on the\n> 'en/t6036-recursive-corner-cases' branch).\n\nThanks, I see the same breakage in my build, too.\n\n>\n> ATB,\n> Ramsay Jones\n>\n>  t/t6036-recursive-corner-cases.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh\n> index 2a44acace..59e52c5a0 100755\n> --- a/t/t6036-recursive-corner-cases.sh\n> +++ b/t/t6036-recursive-corner-cases.sh\n> @@ -495,7 +495,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict\n>  \t\ttest_write_lines 1 2 3 4 5 6 7 8 >a &&\n>  \t\tgit add a &&\n>  \t\tgit commit -m E3 &&\n> -\t\tgit tag E3\n> +\t\tgit tag E3 &&\n>  \n>  \t\tgit checkout C^0 &&\n>  \t\ttest_must_fail git merge B^0 &&\n"}]}