summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-25 07:41:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-25 07:41:25 (GMT)
commit061ed420ec2dc97e2a922a6f02992869089cefb3 (patch)
tree1727d0497c3823d0f9e56f83b6776788a4c82be9 /git-send-email.perl
parent5983ddc165221c3ec2a4299b65cfb2ecc1ce7765 (diff)
parent9c545816befc7b38e7347beb85fab64840bd0a8f (diff)
downloadgit-061ed420ec2dc97e2a922a6f02992869089cefb3.zip
git-061ed420ec2dc97e2a922a6f02992869089cefb3.tar.gz
git-061ed420ec2dc97e2a922a6f02992869089cefb3.tar.bz2
Merge branch 'bs/sendemail-tighten-anything-by'
The recently added feature to add addresses that are on anything-by: trailers in 'git send-email' was found to be way too eager and considered nonsense strings as if they can be legitimate beginning of *-by: trailer. This has been tightened. * bs/sendemail-tighten-anything-by: send-email: don't cc *-by lines with '-' prefix
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 751cabf..24859a7 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: