[PATCH] send-email: Honor multi-part email messages
- From
Alexey Shumkin <alex.crezoff@gmail.com>
- Date
- Jan 25, 2013, 15:28 UTC
- Message-ID
- <4de442db9fd0896f78166e6038b6ea35ed5ab266.1359126360.git.Alex.Crezoff@gmail.com>
- In-Reply-To
- <cover.1359126360.git.Alex.Crezoff@gmail.com>
"git format-patch --attach/--inline" generates multi-part messages. Every part of such messages can contain non-ASCII characters with its own "Content-Type" and "Content-Transfer-Encoding" headers. But git-send-mail script interprets a patch-file as one-part message and does not recognize multi-part messages. So already quoted printable email subject may be encoded as quoted printable again. Due to this bug email subject looks corrupted in email clients.
Signed-off-by: Alexey Shumkin <Alex.Crezoff@gmail.com> --- git-send-email.perl | 5 ++++ t/t9001-send-email.sh | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+)
diff --git a/git-send-email.perl b/git-send-email.perl index 94c7f76..d49befe 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1499,12 +1499,17 @@ sub file_has_nonascii { sub body_or_subject_has_nonascii { my $fn = shift; + my $multipart = 0; open(my $fh, '<', $fn) or die "unable to open $fn: $!\n"; while (my $line = <$fh>) { last if $line =~ /^$/; + if ($line =~ /^Content-Type:\s*multipart\/mixed.*$/) { + $multipart = 1; + } return 1 if $line =~ /^Subject.*[^[:ascii:]]/; } + return 0 if $multipart; while (my $line = <$fh>) { return 1 if $line =~ /[^[:ascii:]]/; } diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 97d6f4c..c7ed370 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1323,4 +1323,70 @@ test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' ' grep "^!someone@example\.org!$" commandline1 ' +test_expect_success $PREREQ 'setup multi-part message' ' +cat >multi-part-email-using-8bit <<EOF +From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 +Message-Id: <bogus-message-id@example.com> +From: author@example.com +Date: Sat, 12 Jun 2010 15:53:58 +0200 +Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20?= + =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB?= +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="------------123" + +This is a multi-part message in MIME format. +--------------1.7.6.3.4.gf71f +Content-Type: text/plain; charset=UTF-8; format=fixed +Content-Transfer-Encoding: 8bit + +This is a message created with "git format-patch --attach=123" +--- + master | 1 + + файл | 1 + + 2 files changed, 2 insertions(+), 0 deletions(-) + create mode 100644 master + create mode 100644 файл + + +--------------123 +Content-Type: text/x-patch; name="0001-.patch" +Content-Transfer-Encoding: 8bit +Content-Disposition: attachment; filename="0001-.patch" + +diff --git a/master b/master +new file mode 100644 +index 0000000..1f7391f +--- /dev/null ++++ b/master +@@ -0,0 +1 @@ ++master +diff --git a/файл b/файл +new file mode 100644 +index 0000000..44e5cfe +--- /dev/null ++++ b/файл +@@ -0,0 +1 @@ ++содержимое файла + +--------------123-- +EOF +' + +test_expect_success $PREREQ 'setup expect' ' +cat >expected <<EOF +Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB?= +EOF +' + +test_expect_success $PREREQ '--attach/--inline also treats subject' ' + clean_fake_sendmail && + echo bogus | + git send-email --from=author@example.com --to=nobody@example.com \ + --smtp-server="$(pwd)/fake.sendmail" \ + --8bit-encoding=UTF-8 \ + multi-part-email-using-8bit >stdout && + grep "Subject" msgtxt1 >actual && + test_cmp expected actual +' + test_done
-- 1.8.1.1.10.g9255f3f