Adding comments after a tag in the body is a common practise (e.g. in the Linux kernel) and git-send-email has been supporting this for years by removing any trailing cruft after the address.
After some recent changes, any trailing comment is now instead appended to the recipient name (with some random white space inserted) resulting in undesirable noise in the headers, for example: CC: "# 3 . 3 . x : 1b9508f : sched : Rate-limit newidle" <[email protected]> Revert to the earlier behaviour of discarding anything after the (first) address in a tag while parsing the body. Note that multiple addresses after are still allowed after a command line switch (and in a CC header field). Also note that --suppress-cc=self was never honoured when using multiple addresses in a tag. Fixes: b1c8a11c8024 ("send-email: allow multiple emails using --cc, --to and --bcc") Fixes: e3fdbcc8e164 ("parse_mailboxes: accept extra text after <...> address") Signed-off-by: Johan Hovold <[email protected]> --- v2: - update the cc-trailer test - amend commit message and mention the broken --suppress-cc=self git-send-email.perl | 2 +- t/t9001-send-email.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index 068d60b3e698..eea0a517f71b 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1563,7 +1563,7 @@ foreach my $t (@files) { # Now parse the message body while(<$fh>) { $message .= $_; - if (/^(Signed-off-by|Cc): (.*)$/i) { + if (/^(Signed-off-by|Cc): ([^>]*>?)/i) { chomp; my ($what, $c) = ($1, $2); chomp $c; diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 0f398dd1603d..60a80f60b268 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -148,7 +148,6 @@ cat >expected-cc <<\EOF [email protected]! [email protected]! [email protected]! [email protected]! EOF " @@ -159,9 +158,9 @@ test_expect_success $PREREQ 'cc trailer with various syntax' ' 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] + Cc: <[email protected]> # trailing comments are ignored + Cc: <[email protected]>, <[email protected]> one address per line + Cc: "Some # Body" <[email protected]> [ <also.a.comment> ] EOF clean_fake_sendmail && git send-email -1 [email protected] \ -- 2.11.1
