From: Junio C Hamano Date: Fri, 29 Apr 2011 18:09:19 GMT Subject: Re: [PATCH] blame: Improve parsing for emails with spaces Message-ID: <7vr58lvsj4.fsf@alter.siamese.dyndns.org> In-Reply-To: <7vvcxxvsz4.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > Jeff King writes: > >> On Thu, Apr 21, 2011 at 03:07:36PM -0700, Josh Stone wrote: >> >>> One of my git repositories has some old commits where the authors >>> obfuscated their email address as . To >>> handle this, blame needs to look for the leading '<' when scanning >>> to split the "name ", rather then only a space delimiter. > > Given that we enclose the e-mail inside "<>" pair and excise "<" from > author names in fmt_ident(), I think it makes sense to look for " <" like > this patch does. Will queue. Thanks. Author: Josh Stone Date: Thu Apr 21 15:07:36 2011 -0700 blame: tolerate bogus e-mail addresses a bit better The names and e-mails are sanitized by fmt_ident() when creating commits, so that they do not contain "<" nor ">", and the "committer" and "author" lines in the commit object will always be in the form: ("author" | "committer") name SP "<" email ">" SP timestamp SP zone When parsing the email part out, the current code looks for SP starting from the end of the email part, but the author could obfuscate the address as "author at example dot com". We should instead look for SP followed by "<", to match the logic of the side that formats these lines. Signed-off-by: Josh Stone Signed-off-by: Junio C Hamano