{"thread":{"id":"44264","subject":"Re: git 2.10.1 test regression in t4014-format-patch.sh","startedAt":"2016-10-10T00:18:39Z","lastAt":"2016-10-10T02:55:59Z","messageCount":3,"participants":["Josh Triplett","Jeremy Huddleston Sequoia"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"303687","messageId":"F069D0FD-C3CF-4F40-9338-D84E76DB310B@joshtriplett.org","threadId":"44264","inReplyTo":"3CE95FD5-C5A9-4DE3-8B57-80B858769D1B@freedesktop.org","subject":"Re: git 2.10.1 test regression in t4014-format-patch.sh","fromName":"Josh Triplett","fromEmail":"josh@joshtriplett.org","sentAt":"2016-10-10T00:18:15Z","receivedAt":"2016-10-10T00:18:39Z","isPatch":false,"sender":{"key":"josh@joshtriplett.org","avatar":"https://avatars.githubusercontent.com/u/162737?v=4"},"body":"On October 9, 2016 5:15:22 PM PDT, Jeremy Huddleston Sequoia wrote:\n>Hey Josh,\n>\n>Hope you're doing well.\n>\n>I wanted to let you know that this patch of yours, which landed in git\n>2.10.1, introduced some test failures, seen on macOS.\n>\n>Let me know if you need any additional information to track these down.\n>\n>Thanks,\n>Jeremy\n>\n>\n>not ok 65 - format-patch default signature\n>#\t\n>#\t\tgit format-patch --stdout -1 | tail -n 3 >output &&\n>#\t\tsignature >expect &&\n>#\t\ttest_cmp expect output\n>#\t\n>\n>not ok 132 - format-patch --base\n>#\t\n>#\t\tgit checkout side &&\n>#\t\tgit format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual &&\n>#\t\techo >expected &&\n>#\t\techo \"base-commit: $(git rev-parse HEAD~3)\" >>expected &&\n>#\t\techo \"prerequisite-patch-id: $(git show --patch HEAD~2 | git\n>patch-id --stable | awk \"{print \\$1}\")\" >>expected &&\n>#\t\techo \"prerequisite-patch-id: $(git show --patch HEAD~1 | git\n>patch-id --stable | awk \"{print \\$1}\")\" >>expected &&\n>#\t\tsignature >> expected &&\n>#\t\ttest_cmp expected actual\n>#\t\n\nCan you run the test with the option to show the expected and actual strings?\n\nDid the testsuite run with the wrong git somehow?\n\n\n"},{"id":"303688","messageId":"3CE95FD5-C5A9-4DE3-8B57-80B858769D1B@freedesktop.org","threadId":"44264","inReplyTo":null,"subject":"git 2.10.1 test regression in t4014-format-patch.sh","fromName":"Jeremy Huddleston Sequoia","fromEmail":"jeremyhu@freedesktop.org","sentAt":"2016-10-10T00:15:22Z","receivedAt":"2016-10-10T00:33:49Z","isPatch":false,"sender":{"key":"jeremyhu@freedesktop.org","avatar":"https://gravatar.com/avatar/46ea598c50b78a027ee7fb567238ed6f8229d3d220a0d9aa6f82909fa2eb62ad?d=mp&s=160"},"body":"Hey Josh,\n\nHope you're doing well.\n\nI wanted to let you know that this patch of yours, which landed in git 2.10.1, introduced some test failures, seen on macOS.\n\nLet me know if you need any additional information to track these down.\n\nThanks,\nJeremy\n\n\nnot ok 65 - format-patch default signature\n#\t\n#\t\tgit format-patch --stdout -1 | tail -n 3 >output &&\n#\t\tsignature >expect &&\n#\t\ttest_cmp expect output\n#\t\n\nnot ok 132 - format-patch --base\n#\t\n#\t\tgit checkout side &&\n#\t\tgit format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual &&\n#\t\techo >expected &&\n#\t\techo \"base-commit: $(git rev-parse HEAD~3)\" >>expected &&\n#\t\techo \"prerequisite-patch-id: $(git show --patch HEAD~2 | git patch-id --stable | awk \"{print \\$1}\")\" >>expected &&\n#\t\techo \"prerequisite-patch-id: $(git show --patch HEAD~1 | git patch-id --stable | awk \"{print \\$1}\")\" >>expected &&\n#\t\tsignature >> expected &&\n#\t\ttest_cmp expected actual\n#\t\n\n\ncommit 480871e09ed2e5275b4ba16b278681e5a8c122ae\nAuthor: Josh Triplett \nDate: Wed Sep 7 18:12:01 2016 -0700\n\n format-patch: show base info before email signature\n \n Any text below the \"-- \" for the email signature gets treated as part of\n the signature, and many mail clients will trim it from the quoted text\n for a reply. Move it above the signature, so people can reply to it\n more easily.\n \n Similarly, when producing the patch as a MIME attachment, the\n original code placed the base info after the attached part, which\n would be discarded. Move the base info to the end of the part,\n still inside the part boundary.\n \n Add tests for the exact format of the email signature, and add tests\n to ensure that the base info appears before the email signature when\n producing a plain-text output, and that it appears before the part\n boundary when producing a MIME attachment.\n \n Signed-off-by: Josh Triplett \n Signed-off-by: Junio C Hamano \n\n\n"},{"id":"303691","messageId":"DEE09909-A5C9-47D8-B71E-0EC0D6C11B3D@freedesktop.org","threadId":"44264","inReplyTo":"F069D0FD-C3CF-4F40-9338-D84E76DB310B@joshtriplett.org","subject":"Re: git 2.10.1 test regression in t4014-format-patch.sh","fromName":"Jeremy Huddleston Sequoia","fromEmail":"jeremyhu@freedesktop.org","sentAt":"2016-10-10T02:55:26Z","receivedAt":"2016-10-10T02:55:59Z","isPatch":false,"sender":{"key":"jeremyhu@freedesktop.org","avatar":"https://gravatar.com/avatar/46ea598c50b78a027ee7fb567238ed6f8229d3d220a0d9aa6f82909fa2eb62ad?d=mp&s=160"},"body":"\n> On Oct 9, 2016, at 17:18, Josh Triplett wrote:\n> \n> On October 9, 2016 5:15:22 PM PDT, Jeremy Huddleston Sequoia wrote:\n>> Hey Josh,\n>> \n>> Hope you're doing well.\n>> \n>> I wanted to let you know that this patch of yours, which landed in git\n>> 2.10.1, introduced some test failures, seen on macOS.\n>> \n>> Let me know if you need any additional information to track these down.\n>> \n>> Thanks,\n>> Jeremy\n>> \n>> \n>> not ok 65 - format-patch default signature\n>> #\t\n>> #\t\tgit format-patch --stdout -1 | tail -n 3 >output &&\n>> #\t\tsignature >expect &&\n>> #\t\ttest_cmp expect output\n>> #\t\n>> \n>> not ok 132 - format-patch --base\n>> #\t\n>> #\t\tgit checkout side &&\n>> #\t\tgit format-patch --stdout --base=HEAD~3 -1 | tail -n 7 >actual &&\n>> #\t\techo >expected &&\n>> #\t\techo \"base-commit: $(git rev-parse HEAD~3)\" >>expected &&\n>> #\t\techo \"prerequisite-patch-id: $(git show --patch HEAD~2 | git\n>> patch-id --stable | awk \"{print \\$1}\")\" >>expected &&\n>> #\t\techo \"prerequisite-patch-id: $(git show --patch HEAD~1 | git\n>> patch-id --stable | awk \"{print \\$1}\")\" >>expected &&\n>> #\t\tsignature >> expected &&\n>> #\t\ttest_cmp expected actual\n>> #\t\n> \n> Can you run the test with the option to show the expected and actual strings?\n> Did the testsuite run with the wrong git somehow?\n\nNope, it's the right version being tested. The failure seems due to your git_version change not liking our formatting\n\n$ git --version\ngit version 2.10.1 (Apple Git-99)\n\n(the 'Apple Git-XX' being added because this was from a build that had Apple's patch series, including https://github.com/jeremyhu/git/commit/f99905d0752d923e5ec61e14c675a300c6d04284)\n\nWe modify DEF_VER, which confused your regex. Simple patch inc in a separate email.\n\nThanks,\nJeremy\n\n"}]}