diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
| commit | 71da2fb077c90d24f3d3b7597cea0393702ec467 (patch) | |
| tree | 06612b848c076a55271a2b85b9adbf94bd8d672d /git-send-email.perl | |
| parent | 7e02ec2c5d2e54df0300e5035fbb952e8dcf302c (diff) | |
| parent | 9d3343961b845c02f9a3e0e9535492687c404b17 (diff) | |
| download | git-71da2fb077c90d24f3d3b7597cea0393702ec467.tar.gz | |
Merge branch 'jh/send-email-one-cc' into maint
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
* jh/send-email-one-cc:
send-email: only allow one address per body tag
Diffstat (limited to 'git-send-email.perl')
| -rwxr-xr-x | git-send-email.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 068d60b3e6..eea0a517f7 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; |