From: Jeff King <peff@peff.net>
Date: Fri, 17 Jun 2011 15:02:15 GMT
Subject: Re: git imap-send converting my patches to CRLF line endings?
Message-ID: <20110617150215.GA11946@sigill.intra.peff.net>
In-Reply-To: <QMrPJrj9ztlKRRk907LM0hozdFOSLjShMt2uDhbAk6DGxE1OSBFMkg@cipher.nrlssc.navy.mil>

On Fri, Jun 17, 2011 at 09:47:17AM -0500, Brandon Casey wrote:

> > The canonical line ending for mail is CRLF. So yes, it will convert your
> > patch to CRLF for storage. But anything pulling it out of the IMAP
> > folder should convert it back to native line endings.
> 
> Not always.  Modern thunderbird (3.1.10, is that modern? I haven't
> checked), saves mail using CRLF.  I don't have access to gmail at the
> moment, but I'm pretty sure gmail does the same thing, i.e. when you
> select "view original", and then use your browser to "save as...".
> 
> mailsplit was modified to strip CRLF when splitting mail here:
> 
>   c2ca1d7 Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings
> 
> which should have first appeared in git v1.6.5.

Ah, I forgot about that. I am used to unix-y tools like mutt. But it is
obviously sensible for git to accept canonical mail via am, given that
some clients produce it.

> > How do you download and apply the patch exactly? If you are speaking
> > imap to gmail, generally the client would strip out the CR's from the
> > mail.
> 
> Michael, how are you applying the "email"?  Are you using 'git am'? or
> possibly are you trying to use 'git apply'?  You need to use 'git am'.

In another reply that crossed paths with yours, he wrote:

  5. Apply patch on a fresh branch with git apply.

So yeah, I think that is the problem.

-Peff