diff options
author | Baruch Siach <baruch@tkos.co.il> | 2019-03-16 21:26:50 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-04 18:50:03 +0900 |
commit | 9c545816befc7b38e7347beb85fab64840bd0a8f (patch) | |
tree | ee23f81b9db879da9033af9e9c8f4d7628a506e5 /git-send-email.perl | |
parent | 041f5ea1cf987a4068ef5f39ba0a09be85952064 (diff) | |
download | git-9c545816befc7b38e7347beb85fab64840bd0a8f.tar.gz |
send-email: don't cc *-by lines with '-' prefix
Since commit ef0cc1df90f6b ("send-email: also pick up cc addresses from
-by trailers") in git version 2.20, git send-email adds to cc list
addresses from all *-by lines. As a side effect a line with
'-Signed-off-by' is now also added to cc. This makes send-email pick
lines from patches that remove patch files from the git repo. This is
common in the Buildroot project that often removes (and adds) patch
files that have 'Signed-off-by' in their patch description part.
Consider only *-by lines that start with [a-z] (case insensitive) to
avoid unrelated addresses in cc.
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Acked-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 8200d58cdc..62c8f91d26 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1699,7 +1699,7 @@ sub process_file { # Now parse the message body while(<$fh>) { $message .= $_; - if (/^([a-z-]*-by|Cc): (.*)/i) { + if (/^([a-z][a-z-]*-by|Cc): (.*)/i) { chomp; my ($what, $c) = ($1, $2); # strip garbage for the address we'll use: |