From: Alex Riesen Date: Wed, 20 Aug 2008 19:57:34 GMT Subject: Re: git am with MIME Message-ID: <20080820195734.GE16626@blimp.local> In-Reply-To: <20080819170731.GA2424@coredump.intra.peff.net> Jeff King, Tue, Aug 19, 2008 19:07:31 +0200: > On Tue, Aug 19, 2008 at 05:50:14PM +0200, Lea Wiemann wrote: > @@ -107,7 +107,7 @@ static void handle_from(const struct strbuf *from) > el = strcspn(at, " \n\t\r\v\f>"); > strbuf_reset(&email); > strbuf_add(&email, at, el); > - strbuf_remove(&f, at - f.buf, el + 1); > + strbuf_remove(&f, at - f.buf, el + (at[el] ? 1 : 0)); > + strbuf_remove(&f, at - f.buf, el + !!at[el]); (Some people'll kill me for that :)