diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 07:41:25 (GMT) |
| commit | 5983ddc165221c3ec2a4299b65cfb2ecc1ce7765 (patch) | |
| tree | f8ac350fed66a1d195487819d971264e48779c66 /git-send-email.perl | |
| parent | f1c9f6ce38445c7cba7dd5b2a8c329c8fff90993 (diff) | |
| parent | 74d76a17013411d72ebda7c230b9898f3adb1fcc (diff) | |
| download | git-5983ddc165221c3ec2a4299b65cfb2ecc1ce7765.zip git-5983ddc165221c3ec2a4299b65cfb2ecc1ce7765.tar.gz git-5983ddc165221c3ec2a4299b65cfb2ecc1ce7765.tar.bz2 | |
Merge branch 'bc/send-email-qp-cr'
"git send-email" has been taught to use quoted-printable when the
payload contains carriage-return. The use of the mechanism is in
line with the design originally added the codepath that chooses QP
when the payload has overly long lines.
* bc/send-email-qp-cr:
send-email: default to quoted-printable when CR is present
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 8200d58..751cabf 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1872,7 +1872,7 @@ sub apply_transfer_encoding { $message = MIME::Base64::decode($message) if ($from eq 'base64'); - $to = ($message =~ /.{999,}/) ? 'quoted-printable' : '8bit' + $to = ($message =~ /(?:.{999,}|\r)/) ? 'quoted-printable' : '8bit' if $to eq 'auto'; die __("cannot send message as 7bit") |