diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-16 11:18:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-16 11:18:56 -0700 |
| commit | f4c6a0e27548352f131af58bef079bd6c85268f6 (patch) | |
| tree | 14d92568ad42e580f571cd56603bf5d7b1a8437c /git-send-email.perl | |
| parent | Merge branch 'en/ort-inner-merge-error-fix' (diff) | |
| parent | git-send-email: use sanitized address when reading mbox body (diff) | |
| download | git-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-x | git-send-email.perl | 4 |
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; |
