# [PATCH] mailinfo: better parse email adresses containg parentheses 4 messages from 2008-07-21 to 2008-07-22. Participants: Philippe Bruhat (BooK), Lukas Sandström, Junio C Hamano. Thread: https://gitlist.dev/t/14566 ## Philippe Bruhat (BooK), 2008-07-21 13:34 Subject: [PATCH] mailinfo: better parse email adresses containg parentheses Message-ID: <1216647269-12287-1-git-send-email-book@cpan.org> URL: https://gitlist.dev/e/1216647269-12287-1-git-send-email-book%40cpan.org ``` When using git-rebase, author fields containing a ')' at the last position had the close-parens character incorrectly removed because the From: parser incorrectly matched it as user@host (User Name) (removing parentheses), instead of User Name (me) Signed-off-by: Philippe Bruhat (BooK) --- builtin-mailinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c index b99a5b6..5581c9f 100644 --- a/builtin-mailinfo.c +++ b/builtin-mailinfo.c @@ -115,10 +115,10 @@ static void handle_from(const struct strbuf *from) * the () pair at the end. */ strbuf_trim(&f); - if (f.buf[0] == '(') + if (f.buf[0] == '(' && f.len && f.buf[f.len - 1] == ')') { strbuf_remove(&name, 0, 1); - if (f.len && f.buf[f.len - 1] == ')') strbuf_setlen(&f, f.len - 1); + } get_sane_name(&name, &f, &email); strbuf_release(&f); -- 1.5.4.3 ``` ## Lukas Sandström, 2008-07-21 14:36 Subject: Re: [PATCH] mailinfo: better parse email adresses containg parentheses Message-ID: <48849EEF.6070403@etek.chalmers.se> URL: https://gitlist.dev/e/48849EEF.6070403%40etek.chalmers.se In-Reply-To: <1216647269-12287-1-git-send-email-book@cpan.org> ``` Philippe Bruhat (BooK) wrote: > When using git-rebase, author fields containing a ')' at the last > position had the close-parens character incorrectly removed > because the From: parser incorrectly matched it as > > user@host (User Name) > > (removing parentheses), instead of > > User Name (me) > > Signed-off-by: Philippe Bruhat (BooK) ACK. > --- > builtin-mailinfo.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c > index b99a5b6..5581c9f 100644 > --- a/builtin-mailinfo.c > +++ b/builtin-mailinfo.c > @@ -115,10 +115,10 @@ static void handle_from(const struct strbuf *from) > * the () pair at the end. > */ > strbuf_trim(&f); > - if (f.buf[0] == '(') > + if (f.buf[0] == '(' && f.len && f.buf[f.len - 1] == ')') { > strbuf_remove(&name, 0, 1); Note: The line above should obviously be "strbuf_remove(&f, 0, 1);", another error from the strbuf conversion I made. Sigh. > - if (f.len && f.buf[f.len - 1] == ')') > strbuf_setlen(&f, f.len - 1); > + } > > get_sane_name(&name, &f, &email); > strbuf_release(&f); /Lukas ``` ## Junio C Hamano, 2008-07-22 03:16 Subject: Re: [PATCH] mailinfo: better parse email adresses containg parentheses Message-ID: <7v63qyr4kk.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7v63qyr4kk.fsf%40gitster.siamese.dyndns.org In-Reply-To: <1216647269-12287-1-git-send-email-book@cpan.org> ``` "Philippe Bruhat (BooK)" writes: > When using git-rebase, author fields containing a ')' at the last > position had the close-parens character incorrectly removed > because the From: parser incorrectly matched it as > > user@host (User Name) > > (removing parentheses), instead of > > User Name (me) > > Signed-off-by: Philippe Bruhat (BooK) Hmm, tests? By the way, that second form parses like this: mailbox = name-addr = display-name angle-addr = "User Name (me) " display-name = phrase = "User Name" angle-addr = CFWS "<" addr-spec ">" = "(me) " So strictly speaking, shouldn't we be stripping the whole (me) as garbage? It is not even part of the display-name but is a whitespace equivalent comment. ``` ## Philippe Bruhat (BooK), 2008-07-22 10:24 Subject: Re: [PATCH] mailinfo: better parse email adresses containg parentheses Message-ID: <20080722102439.GB7792@plop> URL: https://gitlist.dev/e/20080722102439.GB7792%40plop In-Reply-To: <7v63qyr4kk.fsf@gitster.siamese.dyndns.org> ``` On Mon, Jul 21, 2008 at 08:16:43PM -0700, Junio C Hamano wrote: > > > > Signed-off-by: Philippe Bruhat (BooK) > > Hmm, tests? > > By the way, that second form parses like this: > > mailbox = > name-addr = > display-name angle-addr = "User Name (me) " > > display-name = > phrase = "User Name" > > angle-addr = CFWS "<" addr-spec ">" = "(me) " > > So strictly speaking, shouldn't we be stripping the whole (me) as garbage? > It is not even part of the display-name but is a whitespace equivalent > comment. Well, I use this: "Philippe Bruhat (BooK)" as my From: line, and I would like to be able to use it so in git. As git knows the difference between user name and user email, it should be able to keep the information separate all the way. Which makes me think that since it seems that rebase goes through a patch-file step, the problem with my username may actually lie with creating the patch file (no quotes around a user name containing parens) rather than with parsing the patch From: line. -- Philippe Bruhat (BooK) Everyone's life seems easier from the outside. (Moral from Groo The Wanderer #45 (Epic)) ```