From: Jeff King <peff@peff.net>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: "Väinö Järvelä" <v@pp.inet.fi>, git@vger.kernel.org
Subject: Re: [PATCH] git-gui: Added support for OS X right click
Date: Sat, 4 Aug 2007 03:11:31 -0400 [thread overview]
Message-ID: <20070804071131.GA6557@coredump.intra.peff.net> (raw)
In-Reply-To: <20070804065516.GS20052@spearce.org>
On Sat, Aug 04, 2007 at 02:55:16AM -0400, Shawn O. Pearce wrote:
> V??in?? J??rvel?? <v@pp.inet.fi> wrote:
Your mailer claims this message is in us-ascii, but I think it isn't...
> I had a devil of a time applying your patch though. git-am
> choked because the patch was whitespace damaged, and then after
> hand-correction and resuming it horribly munged your name's encoding
> in the commit. I think there's a bug in there in git-am; I'll
> have to try to track it down. I managed to get the patch applied
> correctly by editing the mbox file directly, so that git-am did
> not need to stop and ask me to resolve the patch.
I tried reproducing the encoding breakage and it ended up fine. I just
edited the patch in the .dotest directory (looks like the leading spaces
were all stripped) and it applied fine when I re-ran "git-am".
Are you sure it didn't get munged by your editor when you hand-edited
the mbox file?
-Peff
next prev parent reply other threads:[~2007-08-04 7:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-03 9:27 [PATCH] git-gui: Added support for OS X right click Väinö Järvelä
2007-08-04 6:55 ` Shawn O. Pearce
2007-08-04 7:11 ` Jeff King [this message]
2007-08-04 7:33 ` Shawn O. Pearce
2007-08-04 7:41 ` Jeff King
2007-08-05 2:48 ` Shawn O. Pearce
2007-08-04 16:37 ` Linus Torvalds
2007-08-04 17:49 ` Jeff King
2007-08-04 17:58 ` Jeff King
2007-08-04 11:36 ` Väinö Järvelä
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=20070804071131.GA6557@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
--cc=v@pp.inet.fi \
/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).