From: H. Peter Anvin Date: Mon, 03 Aug 2009 22:56:50 GMT Subject: Re: Please make git-am handle \r\n-damaged patches Message-ID: <4A776B32.4070509@zytor.com> In-Reply-To: <200908031556.35634.wjl@icecavern.net> On 08/03/2009 02:56 PM, Wesley J. Landaker wrote: > On Monday 03 August 2009 15:30:38 Junio C Hamano wrote: >> "H. Peter Anvin" writes: >>> In a serious case of craniorectal immersion, the Thunderbird developers >>> have started using \r\n line endings on saved emails: >>> >>> https://bugzilla.mozilla.org/show_bug.cgi?id=503271 >>> https://bugzilla.mozilla.org/show_bug.cgi?id=507530 >>> >>> It would be nice if git-am could handle this case automatically. >> Perhaps >> >> $ dos2unix *.eml | git am > > I didn't try it, but would "git am" with "apply.whitespace" and > "core.whitespace" set in some reasonable manner help? Not "automatic", but > may help if dos2unix isn't available for some reason. It works, but it's extremely noisy. -hpa