diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-05 22:54:09 (GMT) |
| commit | 25b1166ab2d4cb1685ecc26a36c35756ed5e1d4d (patch) | |
| tree | 1aff8e0be48964bf844c0115b775436e1b36e4b5 /git-send-email.perl | |
| parent | af3e464a60d43ebf0431aa291014d32983a502e2 (diff) | |
| parent | 2c510f21cd2c571549cf75ff94061a2a6717851f (diff) | |
| download | git-25b1166ab2d4cb1685ecc26a36c35756ed5e1d4d.zip git-25b1166ab2d4cb1685ecc26a36c35756ed5e1d4d.tar.gz git-25b1166ab2d4cb1685ecc26a36c35756ed5e1d4d.tar.bz2 | |
Merge branch 'ew/send-email-mutt-alias-fix' into maint
"git send-email" was confused by escaped quotes stored in the alias
files saved by "mutt", which has been corrected.
* ew/send-email-mutt-alias-fix:
git-send-email: do not double-escape quotes from mutt
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 6caa5b5..d356901 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -524,8 +524,13 @@ my %parse_alias = ( if (/^\s*alias\s+(?:-group\s+\S+\s+)*(\S+)\s+(.*)$/) { my ($alias, $addr) = ($1, $2); $addr =~ s/#.*$//; # mutt allows # comments - # 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, + # unescape them so we do not double-escape them later. + s/\\"/"/g foreach @addr; + $aliases{$alias} = \@addr }}}, mailrc => sub { my $fh = shift; while (<$fh>) { if (/^alias\s+(\S+)\s+(.*)$/) { |