Re: [RFC] git-send-email: do not double-escape quotes from mutt

From: Eric Wong <normalperson@yhbt.net>
Date: Dec 29, 2015, 02:49 UTC
Message-ID: <20151229024930.GA12517@dcvr.yhbt.net>
In-Reply-To: <xmqqlh8ejj79.fsf@gitster.mtv.corp.google.com>

Junio C Hamano <gitster@pobox.com> wrote:

Show 16 quoted lines

> Eric Wong <normalperson@yhbt.net> writes:
> 
> > -			 # commas delimit multiple addresses
> > -			$aliases{$alias} = [ split_addrs($addr) ];
> > +			# commas delimit multiple addresses
> > +			my @addr = split_addrs($addr);
> > +
> > +			# quotes may be escaped in the file,
> > +			# remove them if paired so we do not
> > +			# double-escape them later.
> > +			s/^\\"(.*)\\"/"$1"/g foreach @addr;
> > +			$aliases{$alias} = \@addr
> 
> Can one address have two or more double-quoted string pieces in it?
> If that is possible, (.*) above might want to become (.*?) or even
> ([^"]*) to make it less greedy, perhaps?

Yes. Apparently it's possible to have a double-quote inside the name, too. mutt understands both of the following:

alias qn \"Q. N\\\"ame\" <qn@example.org> # becomes "Q. N\"ame" alias dq \"Dub O.\" \"Q\" <dq@example.org> # becomes "Dub O. Q"

The "qn" case can be taken care of using a simpler replacement on top my original RFC:

--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -530,7 +530,7 @@ my %parse_alias = (
 			# quotes may be escaped in the file,
 			# remove them if paired so we do not
 			# double-escape them later.
-			s/^\\"(.*?)\\"/"$1"/g foreach @addr;
+			s/\\"/"/g foreach @addr;
 			$aliases{$alias} = \@addr
 		}}},
 	mailrc => sub { my $fh = shift; while (<$fh>) {

But I'm not sure how to handle the "dq" case or if that even
happens in practice, as attempting to save an alias with "Dub O." "Q"
in the From: header, mutt shortens it to the expected \"Dub O. Q\"
without extra quotes.

Saving "qn" round trips, so the \\\" in the middle is preserved.