summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-13 13:37:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-13 13:37:25 (GMT)
commit2281aa872154af4cc10a05b09c79a1d41169111d (patch)
treecba0800a79e1347b1d02fef47538d429c421f1d1 /git-send-email.perl
parent291123e69babcbbab720705a1bc1e6f0ba3012a4 (diff)
parent3c88e46f1a4328f594cbdcd6109034d9fb9a1b56 (diff)
downloadgit-2281aa872154af4cc10a05b09c79a1d41169111d.zip
git-2281aa872154af4cc10a05b09c79a1d41169111d.tar.gz
git-2281aa872154af4cc10a05b09c79a1d41169111d.tar.bz2
Merge branch 'al/send-email-auto-cte-fixup'
"git send-email --transfer-encoding=..." in recent versions of Git sometimes produced an empty "Content-Transfer-Encoding:" header, which has been corrected. * al/send-email-auto-cte-fixup: send-email: avoid empty transfer encoding header
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 dc7e738..4b9d3ad 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1848,7 +1848,7 @@ sub apply_transfer_encoding {
my $from = shift;
my $to = shift;
- return $message if ($from eq $to and $from ne '7bit');
+ return ($message, $to) if ($from eq $to and $from ne '7bit');
require MIME::QuotedPrint;
require MIME::Base64;