Merge branch 'mm/send-email-cc-cruft-after-address'

"git send-email" attempts to pick up valid e-mails from the
trailers, but people in real world write non-addresses there, like
"Cc: Stable <[email protected]> # 4.8+", which broke the output depending
on the availability and vintage of Mail::Address perl module.

* mm/send-email-cc-cruft-after-address:
  Git.pm: add comment pointing to t9000
  t9000-addresses: update expected results after fix
  parse_mailboxes: accept extra text after <...> address

Author: gitster

perl/Git.pm

@@ -871,6 +871,8 @@ Return an array of mailboxes extracted from a string.
 
 =cut
 
+# Very close to Mail::Address's parser, but we still have minor
+# differences in some cases (see t9000 for examples).
 sub parse_mailboxes {
 	my $re_comment = qr/\((?:[^)]*)\)/;
 	my $re_quote = qr/"(?:[^\"\\]|\\.)*"/;
@@ -879,6 +881,7 @@ sub parse_mailboxes {
 	# divide the string in tokens of the above form
 	my $re_token = qr/(?:$re_quote|$re_word|$re_comment|\S)/;
 	my @tokens = map { $_ =~ /\s*($re_token)\s*/g } @_;
+	my $end_of_addr_seen = 0;
 
 	# add a delimiter to simplify treatment for the last mailbox
 	push @tokens, ",";
@@ -888,10 +891,10 @@ sub parse_mailboxes {
 		if ($token =~ /^[,;]$/) {
 			# if buffer still contains undeterminated strings
 			# append it at the end of @address or @phrase
-			if (@address) {
-				push @address, @buffer;
-			} else {
+			if ($end_of_addr_seen) {
 				push @phrase, @buffer;
+			} else {
+				push @address, @buffer;
 			}
 
 			my $str_phrase = join ' ', @phrase;
@@ -915,16 +918,16 @@ sub parse_mailboxes {
 			push @addr_list, $str_mailbox if ($str_mailbox);
 
 			@phrase = @address = @comment = @buffer = ();
+			$end_of_addr_seen = 0;
 		} elsif ($token =~ /^\(/) {
 			push @comment, $token;
 		} elsif ($token eq "<") {
 			push @phrase, (splice @address), (splice @buffer);
 		} elsif ($token eq ">") {
+			$end_of_addr_seen = 1;
 			push @address, (splice @buffer);
-		} elsif ($token eq "@") {
+		} elsif ($token eq "@" && !$end_of_addr_seen) {
 			push @address, (splice @buffer), "@";
-		} elsif ($token eq ".") {
-			push @address, (splice @buffer), ".";
 		} else {
 			push @buffer, $token;
 		}

t/t9000/test.pl

@@ -32,15 +32,15 @@
 	q["Jane\" Doe" <[email protected]>],
 	q[Doe, jane <[email protected]>],
 	q["Jane Doe <[email protected]>],
-	q['Jane 'Doe' <[email protected]>]);
+	q['Jane 'Doe' <[email protected]>],
+	q[Jane@:;\.,()<>Doe <[email protected]>],
+	q[Jane <[email protected]> Doe],
+	q[<[email protected]> Jane Doe]);
 
 my @known_failure_list = (q[Jane\ Doe <[email protected]>],
 	q["Doe, Ja"ne <[email protected]>],
 	q["Doe, Katarina" Jane <[email protected]>],
-	q[Jane@:;\.,()<>Doe <[email protected]>],
 	q[Jane [email protected]],
-	q[<[email protected]> Jane Doe],
-	q[Jane <[email protected]> Doe],
 	q["Jane "Kat"a" ri"na" ",Doe" <[email protected]>],
 	q[Jane Doe],
 	q[Jane "Doe <[email protected]>"],

t/t9001-send-email.sh

@@ -140,6 +140,35 @@ test_expect_success $PREREQ 'Verify commandline' '
 	test_cmp expected commandline1
 '
 
+test_expect_success $PREREQ 'setup expect for cc trailer' "
+cat >expected-cc <<\EOF
+[email protected]!
+[email protected]!
+[email protected]!
+[email protected]!
+[email protected]!
+[email protected]!
+[email protected]!
+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: [email protected]
+	Cc: <[email protected]> # this is part of the name
+	Cc: <[email protected]>, <[email protected]> # [email protected]
+	Cc: "Some # Body" <[email protected]> [part.of.name.too]
+	EOF
+	clean_fake_sendmail &&
+	git send-email -1 [email protected] \
+		--smtp-server="$(pwd)/fake.sendmail" &&
+	test_cmp expected-cc commandline1
+'
+
 test_expect_success $PREREQ 'setup expect' "
 cat >expected-show-all-headers <<\EOF
 0001-Second.patch