On 09/05/16 22:39, Jens Neuhalfen wrote: > Hi Gert, > > […] > >> >> Git isn't liking the way you send your patches - I'll apply it manually >> (because it makes sense), but please take a look at "git send-email", >> which will ensure that patches and mail headers, blank encoding, and >> everything is perfect? >> >> If I try to feed your mail into "git am", it complains about >> >> Applying: Prevent integration test timeout bc. of sudo >> fatal: corrupt patch at line 19 >> Patch failed at 0001 Prevent integration test timeout bc. of sudo >> >> - not sure what it is, but it's usually fixed by "git send-email"... thanks. > > strange, I use "git format-patch". I guess that "git am” gets confused about > the “duplicate" Subject/From/.. lines (mail header and patch header).
Generally MUAs are not trustworthy in how they process copy-pasted text. Each MUA behaves differently and requires different tweaks. In this case, I believe it is the first 'From' line in your patch which confuses your Apple Mail, which somehow gets prefixed with a '>'. > I’ll switch to send-email Thanks! That's the most sane MUA for patches. It does everything correctly (at least for the git universe). -- kind regards, David Sommerseth
