On 06/17/2011 09:45 AM, Michael Mc Donnell wrote:
> 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:
>> 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.
^^^^^^^^^
Ok, I suspected that. The thing that you download from your gmail
drafts folder is an email, not a patch. It may contain many inline
patches though. You need to use 'git am' which will extract the
patches from the email and apply them.
A word of caution about using imap and gmail:
Unless something has changed recently, and I don't think it has, if you
_send_ the email using gmail's web interface, it will add newlines at
the 72nd character, and corrupt your patch. So, even though you
uploaded the patch using 'git imap-send', you still have to select it
from your drafts folder and click "send" from gmail's web interface.
So, gmail's imap interface is pretty useless for sending patches. You
should be able to use 'git send-email' and configure gmail as your smtp
server though.
-Brandon
--
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