From: Jeff King Date: Sat, 04 Aug 2007 07:11:31 GMT Subject: Re: [PATCH] git-gui: Added support for OS X right click Message-ID: <20070804071131.GA6557@coredump.intra.peff.net> 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?? 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