diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-10 13:24:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-10 13:24:23 -0800 |
| commit | ea1e784c4739ff35b05a4ddc959482eb00ef48d6 (patch) | |
| tree | e9151ac5280d0b85ac1d9f7de8641ebf12dd13d9 /git-send-email.perl | |
| parent | fc32293502e86be2cabbe5e8e5863a2b657207b8 (diff) | |
| parent | 9d3343961b845c02f9a3e0e9535492687c404b17 (diff) | |
| download | git-ea1e784c4739ff35b05a4ddc959482eb00ef48d6.tar.gz | |
Merge branch 'jh/send-email-one-cc'
"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; |