aboutsummaryrefslogtreecommitdiffstats
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-07-16 11:18:56 -0700
committerJunio C Hamano <gitster@pobox.com>2024-07-16 11:18:56 -0700
commitf4c6a0e27548352f131af58bef079bd6c85268f6 (patch)
tree14d92568ad42e580f571cd56603bf5d7b1a8437c /git-send-email.perl
parentMerge branch 'en/ort-inner-merge-error-fix' (diff)
parentgit-send-email: use sanitized address when reading mbox body (diff)
downloadgit-f4c6a0e27548352f131af58bef079bd6c85268f6.tar.gz
git-f4c6a0e27548352f131af58bef079bd6c85268f6.zip
Merge branch 'cb/send-email-sanitize-trailer-addresses'
Address-looking strings found on the trailer are now placed on the Cc: list after running through sanitize_address by "git send-email". * cb/send-email-sanitize-trailer-addresses: git-send-email: use sanitized address when reading mbox body
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index f0be4b4560..72044e5ef3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1847,9 +1847,9 @@ sub pre_process_file {
$what, $_) unless $quiet;
next;
}
- push @cc, $c;
+ push @cc, $sc;
printf(__("(body) Adding cc: %s from line '%s'\n"),
- $c, $_) unless $quiet;
+ $sc, $_) unless $quiet;
}
}
close $fh;