From: Michael Mc Donnell <michael@mcdonnell.dk>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: git imap-send converting my patches to CRLF line endings?
Date: Fri, 17 Jun 2011 16:45:42 +0200 [thread overview]
Message-ID: <BANLkTin1DAv0pZmZCcrtDyjrUD-ukO6MNQ@mail.gmail.com> (raw)
In-Reply-To: <20110617141450.GA12114@sigill.intra.peff.net>
On Fri, Jun 17, 2011 at 4:14 PM, Jeff King <peff@peff.net> 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.
next prev parent reply other threads:[~2011-06-17 14:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-17 13:35 git imap-send converting my patches to CRLF line endings? Michael Mc Donnell
2011-06-17 14:14 ` Jeff King
2011-06-17 14:45 ` Michael Mc Donnell [this message]
2011-06-17 15:08 ` Brandon Casey
2011-06-17 15:37 ` Brandon Casey
2011-06-17 15:50 ` Jeff King
2011-06-17 16:54 ` Brandon Casey
2011-06-20 10:40 ` Michael Mc Donnell
2011-06-17 14:47 ` Brandon Casey
2011-06-17 15:02 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BANLkTin1DAv0pZmZCcrtDyjrUD-ukO6MNQ@mail.gmail.com \
--to=michael@mcdonnell.dk \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).