From: Mark Rada Date: Mon, 05 Oct 2009 01:25:27 GMT Subject: Re: [PATCH] tests: make all test files executable Message-ID: <4AC94B07.4000803@mailservices.uwaterloo.ca> In-Reply-To: <20091004134022.GA14209@sigill.intra.peff.net> On 09-10-04 9:40 AM, Jeff King wrote: > On Sun, Oct 04, 2009 at 09:18:20AM -0400, Mark Rada wrote: > >>> Ah, nevermind. The problem is that your patch was word-wrapped, making >>> the second "diff --git" line bogus. It would have been nice to have it >>> print a warning instead of silently ignoring that bit of the patch. >>> >> I didn't have format=flowed buggering things up this time, so I don't >> quite understand the problem; could you please explain with more >> details? > > Sure. The patch is perfect except for one line. What should have been: > > diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh > > was wrapped to: > > diff --git a/t/t9501-gitweb-standalone-http-status.sh > b/t/t9501-gitweb-standalone-http-status.sh > > I have no idea how you did that, though. :) > > It looks like you send with Thunderbird. How do you get the diff content > into the email? Is it possible that it wraps the content after you have > gotten it there? I don't think so, I have plug-in that disables wrapping and has worked just fine for the last couple of patches I sent, so I'm not sure what was going on there. >> When I try to apply the patch from a saved copy of the e-mail, I get >> the following error: >> >> # git am ~/Downloads/\[PATCH\]\ tests_\ make\ all\ test\ files\ >> executable.eml >> Patch format detection failed. >> zsh: exit 1 git am >> >> The difference between the patch created by format-patch and the saved >> e-mail is just some e-mail header information. Is that a different error >> than what you were getting? I'm not sure what I'm doing wrong here, help >> would be appreciated. > > Yeah, that's totally different than the problem I was having. I save to > an mbox from mutt, which "git am" understands just fine. I'd have to see > what was in your .eml file to know why "git am" couldn't figure it out > (and it might be a good test case, as "git am" has recently learned to > accept more mailbox formats). I've attached a copy of the .eml file. -- Mark Rada (ferrous26) marada@uwaterloo.ca From: Mark Rada Date: Thu, 01 Oct 2009 21:59:20 -0400 To: Junio C Hamano CC: git@vger.kernel.org Rm9yIGNvbnNpc3RlbmN5IHdpdGggdGhlIHJlc3Qgb2YgdGhlIHRlc3QgZmlsZXMuCgpTaWdu ZWQtb2ZmLWJ5OiBNYXJrIFJhZGEgPG1hcmFkYUB1d2F0ZXJsb28uY2E+Ci0tLQoKT24gMjAw OS0xMC0wMSwgYXQgNDoxMyBBTSwgSmFrdWIgTmFyZWJza2kgd3JvdGU6Cj4+ID4+IGRpZmYg LS1naXQgYS90L3Q5NTAxLWdpdHdlYi1zdGFuZGFsb25lLWh0dHAtc3RhdHVzLnNoIGIvdC90 OTUwMS1naXR3ZWItc3RhbmRhbG9uZS1odHRwLXN0YXR1cy5zaAo+PiA+PiBpbmRleCBkMGZm MjFkLi4wNjg4YTU3IDEwMDY0NAo+PiA+PiAtLS0gYS90L3Q5NTAxLWdpdHdlYi1zdGFuZGFs b25lLWh0dHAtc3RhdHVzLnNoCj4+ID4+ICsrKyBiL3QvdDk1MDEtZ2l0d2ViLXN0YW5kYWxv bmUtaHR0cC1zdGF0dXMuc2gKPiA+IAo+ID4gQlRXLiB0aGUgcmVzdCBvZiB0ZXN0IHNjcmlw dHMgYXJlIGV4ZWN1dGFibGUsIGJ1dCBub3QgdGhpcyBvbmU/IFdoeT8KPiA+IChCdXQgY29y cmVjdGluZyB0aGlzIHNob3VsZCBiZSBkb25lLCBpZiBuZWVkZWQsIGluIHNlcGFyYXRlIGNv bW1pdCkuCgpJIG5vdGljZWQgb25lIG90aGVyIHRlc3Qgc2NyaXB0IHRoYXQgd2FzIG5vdCBz ZXQgdG8gYmUgZXhlY3V0YWJsZS4KCgogMCBmaWxlcyBjaGFuZ2VkLCAwIGluc2VydGlvbnMo KyksIDAgZGVsZXRpb25zKC0pCiBtb2RlIGNoYW5nZSAxMDA2NDQgPT4gMTAwNzU1IHQvdDU1 MzEtZGVlcC1zdWJtb2R1bGUtcHVzaC5zaAogbW9kZSBjaGFuZ2UgMTAwNjQ0ID0+IDEwMDc1 NSB0L3Q5NTAxLWdpdHdlYi1zdGFuZGFsb25lLWh0dHAtc3RhdHVzLnNoCgpkaWZmIC0tZ2l0 IGEvdC90NTUzMS1kZWVwLXN1Ym1vZHVsZS1wdXNoLnNoIGIvdC90NTUzMS1kZWVwLXN1Ym1v ZHVsZS1wdXNoLnNoCm9sZCBtb2RlIDEwMDY0NApuZXcgbW9kZSAxMDA3NTUKZGlmZiAtLWdp dCBhL3QvdDk1MDEtZ2l0d2ViLXN0YW5kYWxvbmUtaHR0cC1zdGF0dXMuc2gKYi90L3Q5NTAx LWdpdHdlYi1zdGFuZGFsb25lLWh0dHAtc3RhdHVzLnNoCm9sZCBtb2RlIDEwMDY0NApuZXcg bW9kZSAxMDA3NTUKLS0gMS42LjUucmMyIA==