From: Mark Rada Date: Sun, 04 Oct 2009 13:18:20 GMT Subject: Re: [PATCH] tests: make all test files executable Message-ID: <1762B430-2DC0-48F5-8C34-8428F9145A1E@mailservices.uwaterloo.ca> In-Reply-To: <20091002083946.GA8627@coredump.intra.peff.net> On 2009-10-02, at 4:39 AM, Jeff King wrote: > On Fri, Oct 02, 2009 at 04:01:34AM -0400, Jeff King wrote: > >>> 0 files changed, 0 insertions(+), 0 deletions(-) >>> mode change 100644 => 100755 t/t5531-deep-submodule-push.sh >>> mode change 100644 => 100755 t/t9501-gitweb-standalone-http- >>> status.sh >>> >>> diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep- >>> submodule-push.sh >>> old mode 100644 >>> new mode 100755 >>> diff --git a/t/t9501-gitweb-standalone-http-status.sh >>> b/t/t9501-gitweb-standalone-http-status.sh >>> old mode 100644 >>> new mode 100755 >> >> When applying via "am", I only got the first change in my tree. >> I'll see >> if I can confirm and make a test case. > > 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? 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. -- Mark Rada (ferrous26) marada@uwaterloo.ca