{"thread":{"id":"21111","subject":"[PATCH] tests: make all test files executable","startedAt":"2009-10-02T01:59:20Z","lastAt":"2009-10-05T09:59:12Z","messageCount":7,"participants":["Mark Rada","Jeff King"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"124109","messageId":"4AC55E78.7010109@mailservices.uwaterloo.ca","threadId":"21111","inReplyTo":null,"subject":"[PATCH] tests: make all test files executable","fromName":"Mark Rada","fromEmail":"marada@uwaterloo.ca","sentAt":"2009-10-02T01:59:20Z","receivedAt":"2009-10-02T01:59:20Z","isPatch":true,"sender":{"key":"marada@uwaterloo.ca","avatar":"https://avatars.githubusercontent.com/u/38430?v=4"},"body":"For consistency with the rest of the test files.\n\nSigned-off-by: Mark Rada <marada@uwaterloo.ca>\n---\n\nOn 2009-10-01, at 4:13 AM, Jakub Narebski wrote:\n>> diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh\n>> index d0ff21d..0688a57 100644\n>> --- a/t/t9501-gitweb-standalone-http-status.sh\n>> +++ b/t/t9501-gitweb-standalone-http-status.sh\n> \n> BTW. the rest of test scripts are executable, but not this one? Why?\n> (But correcting this should be done, if needed, in separate commit).\n\nI noticed one other test script that was not set to be executable.\n\n\n 0 files changed, 0 insertions(+), 0 deletions(-)\n mode change 100644 => 100755 t/t5531-deep-submodule-push.sh\n mode change 100644 => 100755 t/t9501-gitweb-standalone-http-status.sh\n\ndiff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh\nold mode 100644\nnew mode 100755\ndiff --git a/t/t9501-gitweb-standalone-http-status.sh\nb/t/t9501-gitweb-standalone-http-status.sh\nold mode 100644\nnew mode 100755\n-- \n1.6.5.rc2\n"},{"id":"124117","messageId":"20091002080134.GD27664@coredump.intra.peff.net","threadId":"21111","inReplyTo":"4AC55E78.7010109@mailservices.uwaterloo.ca","subject":"Re: [PATCH] tests: make all test files executable","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-10-02T08:01:34Z","receivedAt":"2009-10-02T08:01:34Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Oct 01, 2009 at 09:59:20PM -0400, Mark Rada wrote:\n\n> For consistency with the rest of the test files.\n\nThanks. Interestingly, though, I think this may be triggering a bug in\ngit-am:\n\n>  0 files changed, 0 insertions(+), 0 deletions(-)\n>  mode change 100644 => 100755 t/t5531-deep-submodule-push.sh\n>  mode change 100644 => 100755 t/t9501-gitweb-standalone-http-status.sh\n> \n> diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh\n> old mode 100644\n> new mode 100755\n> diff --git a/t/t9501-gitweb-standalone-http-status.sh\n> b/t/t9501-gitweb-standalone-http-status.sh\n> old mode 100644\n> new mode 100755\n\nWhen applying via \"am\", I only got the first change in my tree. I'll see\nif I can confirm and make a test case.\n\n-Peff\n"},{"id":"124121","messageId":"20091002083946.GA8627@coredump.intra.peff.net","threadId":"21111","inReplyTo":"20091002080134.GD27664@coredump.intra.peff.net","subject":"Re: [PATCH] tests: make all test files executable","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-10-02T08:39:46Z","receivedAt":"2009-10-02T08:39:46Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Oct 02, 2009 at 04:01:34AM -0400, Jeff King wrote:\n\n> >  0 files changed, 0 insertions(+), 0 deletions(-)\n> >  mode change 100644 => 100755 t/t5531-deep-submodule-push.sh\n> >  mode change 100644 => 100755 t/t9501-gitweb-standalone-http-status.sh\n> > \n> > diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh\n> > old mode 100644\n> > new mode 100755\n> > diff --git a/t/t9501-gitweb-standalone-http-status.sh\n> > b/t/t9501-gitweb-standalone-http-status.sh\n> > old mode 100644\n> > new mode 100755\n> \n> When applying via \"am\", I only got the first change in my tree. I'll see\n> if I can confirm and make a test case.\n\nAh, nevermind. The problem is that your patch was word-wrapped, making\nthe second \"diff --git\" line bogus. It would have been nice to have it\nprint a warning instead of silently ignoring that bit of the patch.\n\nI'm not sure if it is a good idea, though. git-apply sees that the \"diff\n--git\" line is there but can't get a filename from it. Which _should_\ncause it to barf when we get to the mode lines. But we first see the\nwrapped filename and consider that patch section to be over (and the\nmode lines just become cruft at the end of the patch, which we must\nignore).\n\nAnd we must consider that patch section to be over when we see random\ntext, because we need to jump back to the outer parser looking for more\nhunks. We could warn about a \"diff --git\" line that has no actual\nchanges associated with it, though that is certainly a user-visible\nchange. I also suspect it wouldn't help if there was a mode change\nfollowed by some actual content changes.\n\nHmph.\n\n-Peff\n"},{"id":"299132","messageId":"1762B430-2DC0-48F5-8C34-8428F9145A1E@mailservices.uwaterloo.ca","threadId":"21111","inReplyTo":"20091002083946.GA8627@coredump.intra.peff.net","subject":"Re: [PATCH] tests: make all test files executable","fromName":"Mark Rada","fromEmail":"marada@uwaterloo.ca","sentAt":"2009-10-04T13:18:20Z","receivedAt":"2009-10-04T13:18:20Z","isPatch":true,"sender":{"key":"marada@uwaterloo.ca","avatar":"https://avatars.githubusercontent.com/u/38430?v=4"},"body":"On 2009-10-02, at 4:39 AM, Jeff King wrote:\n\n> On Fri, Oct 02, 2009 at 04:01:34AM -0400, Jeff King wrote:\n>\n>>> 0 files changed, 0 insertions(+), 0 deletions(-)\n>>> mode change 100644 => 100755 t/t5531-deep-submodule-push.sh\n>>> mode change 100644 => 100755 t/t9501-gitweb-standalone-http- \n>>> status.sh\n>>>\n>>> diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep- \n>>> submodule-push.sh\n>>> old mode 100644\n>>> new mode 100755\n>>> diff --git a/t/t9501-gitweb-standalone-http-status.sh\n>>> b/t/t9501-gitweb-standalone-http-status.sh\n>>> old mode 100644\n>>> new mode 100755\n>>\n>> When applying via \"am\", I only got the first change in my tree.  \n>> I'll see\n>> if I can confirm and make a test case.\n>\n> Ah, nevermind. The problem is that your patch was word-wrapped, making\n> the second \"diff --git\" line bogus. It would have been nice to have it\n> print a warning instead of silently ignoring that bit of the patch.\n>\n\nI didn't have format=flowed buggering things up this time, so I don't\nquite understand the problem; could you please explain with more  \ndetails?\n\nWhen I try to apply the patch from a saved copy of the e-mail, I get\nthe following error:\n\n\t# git am ~/Downloads/\\[PATCH\\]\\ tests_\\ make\\ all\\ test\\ files\\  \nexecutable.eml\n\tPatch format detection failed.\n\tzsh: exit 1     git am\n\nThe difference between the patch created by format-patch and the saved\ne-mail is just some e-mail header information. Is that a different error\nthan what you were getting? I'm not sure what I'm doing wrong here, help\nwould be appreciated.\n\n--\nMark Rada (ferrous26)\nmarada@uwaterloo.ca\n\n\n"},{"id":"299133","messageId":"20091004134022.GA14209@sigill.intra.peff.net","threadId":"21111","inReplyTo":"1762B430-2DC0-48F5-8C34-8428F9145A1E@mailservices.uwaterloo.ca","subject":"Re: [PATCH] tests: make all test files executable","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-10-04T13:40:22Z","receivedAt":"2009-10-04T13:40:22Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Oct 04, 2009 at 09:18:20AM -0400, Mark Rada wrote:\n\n> >Ah, nevermind. The problem is that your patch was word-wrapped, making\n> >the second \"diff --git\" line bogus. It would have been nice to have it\n> >print a warning instead of silently ignoring that bit of the patch.\n> >\n> I didn't have format=flowed buggering things up this time, so I don't\n> quite understand the problem; could you please explain with more\n> details?\n\nSure. The patch is perfect except for one line. What should have been:\n\ndiff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh\n\nwas wrapped to:\n\ndiff --git a/t/t9501-gitweb-standalone-http-status.sh\nb/t/t9501-gitweb-standalone-http-status.sh\n\nI have no idea how you did that, though. :)\n\nIt looks like you send with Thunderbird. How do you get the diff content\ninto the email? Is it possible that it wraps the content after you have\ngotten it there?\n\n> When I try to apply the patch from a saved copy of the e-mail, I get\n> the following error:\n> \n> \t# git am ~/Downloads/\\[PATCH\\]\\ tests_\\ make\\ all\\ test\\ files\\\n> executable.eml\n> \tPatch format detection failed.\n> \tzsh: exit 1     git am\n> \n> The difference between the patch created by format-patch and the saved\n> e-mail is just some e-mail header information. Is that a different error\n> than what you were getting? I'm not sure what I'm doing wrong here, help\n> would be appreciated.\n\nYeah, that's totally different than the problem I was having. I save to\nan mbox from mutt, which \"git am\" understands just fine. I'd have to see\nwhat was in your .eml file to know why \"git am\" couldn't figure it out\n(and it might be a good test case, as \"git am\" has recently learned to\naccept more mailbox formats).\n\n-Peff\n"},{"id":"124211","messageId":"4AC94B07.4000803@mailservices.uwaterloo.ca","threadId":"21111","inReplyTo":"20091004134022.GA14209@sigill.intra.peff.net","subject":"Re: [PATCH] tests: make all test files executable","fromName":"Mark Rada","fromEmail":"marada@uwaterloo.ca","sentAt":"2009-10-05T01:25:27Z","receivedAt":"2009-10-05T01:25:27Z","isPatch":true,"sender":{"key":"marada@uwaterloo.ca","avatar":"https://avatars.githubusercontent.com/u/38430?v=4"},"body":"On 09-10-04 9:40 AM, Jeff King wrote:\n> On Sun, Oct 04, 2009 at 09:18:20AM -0400, Mark Rada wrote:\n> \n>>> Ah, nevermind. The problem is that your patch was word-wrapped, making\n>>> the second \"diff --git\" line bogus. It would have been nice to have it\n>>> print a warning instead of silently ignoring that bit of the patch.\n>>>\n>> I didn't have format=flowed buggering things up this time, so I don't\n>> quite understand the problem; could you please explain with more\n>> details?\n> \n> Sure. The patch is perfect except for one line. What should have been:\n> \n> diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh\n> \n> was wrapped to:\n> \n> diff --git a/t/t9501-gitweb-standalone-http-status.sh\n> b/t/t9501-gitweb-standalone-http-status.sh\n> \n> I have no idea how you did that, though. :)\n> \n> It looks like you send with Thunderbird. How do you get the diff content\n> into the email? Is it possible that it wraps the content after you have\n> gotten it there?\n\nI don't think so, I have plug-in that disables wrapping and has worked\njust fine for the last couple of patches I sent, so I'm not sure what\nwas going on there.\n\n>> When I try to apply the patch from a saved copy of the e-mail, I get\n>> the following error:\n>>\n>> \t# git am ~/Downloads/\\[PATCH\\]\\ tests_\\ make\\ all\\ test\\ files\\\n>> executable.eml\n>> \tPatch format detection failed.\n>> \tzsh: exit 1     git am\n>>\n>> The difference between the patch created by format-patch and the saved\n>> e-mail is just some e-mail header information. Is that a different error\n>> than what you were getting? I'm not sure what I'm doing wrong here, help\n>> would be appreciated.\n> \n> Yeah, that's totally different than the problem I was having. I save to\n> an mbox from mutt, which \"git am\" understands just fine. I'd have to see\n> what was in your .eml file to know why \"git am\" couldn't figure it out\n> (and it might be a good test case, as \"git am\" has recently learned to\n> accept more mailbox formats).\n\nI've attached a copy of the .eml file.\n\n\n-- \nMark Rada (ferrous26)\nmarada@uwaterloo.ca\n\n\nFrom:\nMark Rada <marada@mailservices.uwaterloo.ca>\nDate:\nThu, 01 Oct 2009 21:59:20 -0400\nTo:\nJunio C Hamano <gitster@pobox.com>\nCC:\ngit@vger.kernel.org\n\nRm9yIGNvbnNpc3RlbmN5IHdpdGggdGhlIHJlc3Qgb2YgdGhlIHRlc3QgZmlsZXMuCgpTaWdu\nZWQtb2ZmLWJ5OiBNYXJrIFJhZGEgPG1hcmFkYUB1d2F0ZXJsb28uY2E+Ci0tLQoKT24gMjAw\nOS0xMC0wMSwgYXQgNDoxMyBBTSwgSmFrdWIgTmFyZWJza2kgd3JvdGU6Cj4+ID4+IGRpZmYg\nLS1naXQgYS90L3Q5NTAxLWdpdHdlYi1zdGFuZGFsb25lLWh0dHAtc3RhdHVzLnNoIGIvdC90\nOTUwMS1naXR3ZWItc3RhbmRhbG9uZS1odHRwLXN0YXR1cy5zaAo+PiA+PiBpbmRleCBkMGZm\nMjFkLi4wNjg4YTU3IDEwMDY0NAo+PiA+PiAtLS0gYS90L3Q5NTAxLWdpdHdlYi1zdGFuZGFs\nb25lLWh0dHAtc3RhdHVzLnNoCj4+ID4+ICsrKyBiL3QvdDk1MDEtZ2l0d2ViLXN0YW5kYWxv\nbmUtaHR0cC1zdGF0dXMuc2gKPiA+IAo+ID4gQlRXLiB0aGUgcmVzdCBvZiB0ZXN0IHNjcmlw\ndHMgYXJlIGV4ZWN1dGFibGUsIGJ1dCBub3QgdGhpcyBvbmU/IFdoeT8KPiA+IChCdXQgY29y\ncmVjdGluZyB0aGlzIHNob3VsZCBiZSBkb25lLCBpZiBuZWVkZWQsIGluIHNlcGFyYXRlIGNv\nbW1pdCkuCgpJIG5vdGljZWQgb25lIG90aGVyIHRlc3Qgc2NyaXB0IHRoYXQgd2FzIG5vdCBz\nZXQgdG8gYmUgZXhlY3V0YWJsZS4KCgogMCBmaWxlcyBjaGFuZ2VkLCAwIGluc2VydGlvbnMo\nKyksIDAgZGVsZXRpb25zKC0pCiBtb2RlIGNoYW5nZSAxMDA2NDQgPT4gMTAwNzU1IHQvdDU1\nMzEtZGVlcC1zdWJtb2R1bGUtcHVzaC5zaAogbW9kZSBjaGFuZ2UgMTAwNjQ0ID0+IDEwMDc1\nNSB0L3Q5NTAxLWdpdHdlYi1zdGFuZGFsb25lLWh0dHAtc3RhdHVzLnNoCgpkaWZmIC0tZ2l0\nIGEvdC90NTUzMS1kZWVwLXN1Ym1vZHVsZS1wdXNoLnNoIGIvdC90NTUzMS1kZWVwLXN1Ym1v\nZHVsZS1wdXNoLnNoCm9sZCBtb2RlIDEwMDY0NApuZXcgbW9kZSAxMDA3NTUKZGlmZiAtLWdp\ndCBhL3QvdDk1MDEtZ2l0d2ViLXN0YW5kYWxvbmUtaHR0cC1zdGF0dXMuc2gKYi90L3Q5NTAx\nLWdpdHdlYi1zdGFuZGFsb25lLWh0dHAtc3RhdHVzLnNoCm9sZCBtb2RlIDEwMDY0NApuZXcg\nbW9kZSAxMDA3NTUKLS0gMS42LjUucmMyIA=="},{"id":"124235","messageId":"20091005095912.GA31426@coredump.intra.peff.net","threadId":"21111","inReplyTo":"4AC94B07.4000803@mailservices.uwaterloo.ca","subject":"Re: [PATCH] tests: make all test files executable","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-10-05T09:59:12Z","receivedAt":"2009-10-05T09:59:12Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Oct 04, 2009 at 09:25:27PM -0400, Mark Rada wrote:\n\n> > It looks like you send with Thunderbird. How do you get the diff content\n> > into the email? Is it possible that it wraps the content after you have\n> > gotten it there?\n> \n> I don't think so, I have plug-in that disables wrapping and has worked\n> just fine for the last couple of patches I sent, so I'm not sure what\n> was going on there.\n\nI don't know, then. I'm pretty sure it wasn't wrapped up on my end, as\nit is also wrapped in gmane:\n\n  http://article.gmane.org/gmane.comp.version-control.git/129420\n\nMaybe some hints are here:\n\n  http://kb.mozillazine.org/Plain_text_e-mail_-_Thunderbird\n\n> > an mbox from mutt, which \"git am\" understands just fine. I'd have to see\n> > what was in your .eml file to know why \"git am\" couldn't figure it out\n> > (and it might be a good test case, as \"git am\" has recently learned to\n> > accept more mailbox formats).\n> \n> I've attached a copy of the .eml file.\n\nHmm. The .eml format appears to be some kind of inscrutable binary\nformat. \"git am\" certainly won't understand it. I'm not sure how you\ncreated it, but you need to convince Thunderbird to export as an 'mbox'\nformat (which it clearly understands, as that is its native local\nformat). I have no idea how to do that, though.\n\n-Peff\n"}]}