On Fri, Jun 17, 2011 at 4:14 PM, Jeff King <peff@xxxxxxxx> wrote: > On Fri, Jun 17, 2011 at 03:35:04PM +0200, Michael Mc Donnell wrote: > >> I'm using git imap-send to send patches to wine-patches, and it seems >> like it converts all my patches to have CRLF line endings? > > 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. Ok, so it's the clients responsibility to convert it back? >> I can see it when I download the patch from the Gmail drafts folder. >> Git complains about white space when I apply the downloaded patch. It >> works fine if I just use git to create the patch and then apply it on >> a new branch. Is it git imap-send or just Gmail that's the problem? > > 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. I'm just downloading it with Chrome. Steps to reproduce: 1. Upload patch via: $ git format-patch --stdout --keep-subject --attach origin | git imap-send 2. Open Gmail in Chrome. 3. Open email in drafts folder. 4. Click attachment download link 5. Apply patch on a fresh branch with git apply. Git complains about the white space, which indicates that the downloaded version has CRLF line endings. I guess there's not much to do if the fault lies with Gmail? Thanks for your reply. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html