undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

parse_mailboxes: accept extra text after <...> address

Browse Source 
The test introduced in this commit succeeds without the patch to Git.pm
if Mail::Address is installed, but fails otherwise because our in-house
parser does not accept any text after the email address. They succeed
both with and without Mail::Address after this commit.

Mail::Address accepts extra text and considers it as part of the name,
iff the address is surrounded with <...>. The implementation mimics
this behavior as closely as possible.

This mostly restores the behavior we had before b1c8a11 (send-email:
allow multiple emails using --cc, --to and --bcc, 2015-06-30), but we
keep the possibility to handle comma-separated lists.

Reported-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Matthieu Moy 2016-10-13 07:47:27 +02:00 committed by Junio C Hamano
parent fa5b1aa9a1
commit e3fdbcc8e1
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
perl/Git.pm
View File

@ -878,6 +878,7 @@ sub parse_mailboxes {
# divide the string in tokens of the above form # divide the string in tokens of the above form
my $re_token = qr/(?:$re_quote|$re_word|$re_comment|\S)/; my $re_token = qr/(?:$re_quote|$re_word|$re_comment|\S)/;
my @tokens = map { $_ =~ /\s*($re_token)\s*/g } @_; my @tokens = map { $_ =~ /\s*($re_token)\s*/g } @_;
my $end_of_addr_seen = 0;
# add a delimiter to simplify treatment for the last mailbox # add a delimiter to simplify treatment for the last mailbox
push @tokens, ","; push @tokens, ",";
@ -887,10 +888,10 @@ sub parse_mailboxes {
if ($token =~ /^[,;]$/) { if ($token =~ /^[,;]$/) {
# if buffer still contains undeterminated strings # if buffer still contains undeterminated strings
# append it at the end of @address or @phrase # append it at the end of @address or @phrase
if (@address) { if ($end_of_addr_seen) {
push @address, @buffer;
} else {
push @phrase, @buffer; push @phrase, @buffer;
} else {
push @address, @buffer;
} }
my $str_phrase = join ' ', @phrase; my $str_phrase = join ' ', @phrase;
@ -914,16 +915,16 @@ sub parse_mailboxes {
push @addr_list, $str_mailbox if ($str_mailbox); push @addr_list, $str_mailbox if ($str_mailbox);
@phrase = @address = @comment = @buffer = (); @phrase = @address = @comment = @buffer = ();
$end_of_addr_seen = 0;
} elsif ($token =~ /^\(/) { } elsif ($token =~ /^\(/) {
push @comment, $token; push @comment, $token;
} elsif ($token eq "<") { } elsif ($token eq "<") {
push @phrase, (splice @address), (splice @buffer); push @phrase, (splice @address), (splice @buffer);
} elsif ($token eq ">") { } elsif ($token eq ">") {
$end_of_addr_seen = 1;
push @address, (splice @buffer); push @address, (splice @buffer);
} elsif ($token eq "@") { } elsif ($token eq "@" && !$end_of_addr_seen) {
push @address, (splice @buffer), "@"; push @address, (splice @buffer), "@";
} elsif ($token eq ".") {
push @address, (splice @buffer), ".";
} else { } else {
push @buffer, $token; push @buffer, $token;
} }

29
t/t9001-send-email.sh
View File

@ -140,6 +140,35 @@ test_expect_success $PREREQ 'Verify commandline' '
test_cmp expected commandline1 test_cmp expected commandline1
' '
test_expect_success $PREREQ 'setup expect for cc trailer' "
cat >expected-cc <<\EOF
!recipient@example.com!
!author@example.com!
!one@example.com!
!two@example.com!
!three@example.com!
!four@example.com!
!five@example.com!
EOF
"
test_expect_success $PREREQ 'cc trailer with various syntax' '
test_commit cc-trailer &&
test_when_finished "git reset --hard HEAD^" &&
git commit --amend -F - <<-EOF &&
Test Cc: trailers.
Cc: one@example.com
Cc: <two@example.com> # this is part of the name
Cc: <three@example.com>, <four@example.com> # not.five@example.com
Cc: "Some # Body" <five@example.com> [part.of.name.too]
EOF
clean_fake_sendmail &&
git send-email -1 --to=recipient@example.com \
--smtp-server="$(pwd)/fake.sendmail" &&
test_cmp expected-cc commandline1
'
test_expect_success $PREREQ 'setup expect' " test_expect_success $PREREQ 'setup expect' "
cat >expected-show-all-headers <<\EOF cat >expected-show-all-headers <<\EOF
0001-Second.patch 0001-Second.patch