send-email: use UTF-8 rather than utf-8 for consistency

The rest of the git source has been converted to use upper-case character
encoding names to assist older platforms.  The charset attribute of MIME
is defined to be case-insensitive, but older platforms may still have an
easier time dealing with upper-case rather than lower-case.  So do so for
send-email too.

Update t9001 to handle the changes.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-send-email.perl b/git-send-email.perl
index 8a1a40d18645a0d178a1e2592da3efdb322c89f8..4c795a4b0310aa0d8081dcaea0a9d9593643e704 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -577,7 +577,7 @@ ($)
                        if ($need_8bit_cte) {
                                print C2 "MIME-Version: 1.0\n",
                                         "Content-Type: text/plain; ",
                        if ($need_8bit_cte) {
                                print C2 "MIME-Version: 1.0\n",
                                         "Content-Type: text/plain; ",

-                                          "charset=utf-8\n",
+                                          "charset=UTF-8\n",

                                         "Content-Transfer-Encoding: 8bit\n";
                        }
                } elsif (/^MIME-Version:/i) {
                                         "Content-Transfer-Encoding: 8bit\n";
                        }
                } elsif (/^MIME-Version:/i) {


@@ -766,7 +766,7 @@ sub unquote_rfc2047 {
 
 sub quote_rfc2047 {
        local $_ = shift;
 
 sub quote_rfc2047 {
        local $_ = shift;

-       my $encoding = shift || 'utf-8';
+       my $encoding = shift || 'UTF-8';

        s/([^-a-zA-Z0-9!*+\/])/sprintf("=%02X", ord($1))/eg;
        s/(.*)/=\?$encoding\?q\?$1\?=/;
        return $_;
        s/([^-a-zA-Z0-9!*+\/])/sprintf("=%02X", ord($1))/eg;
        s/(.*)/=\?$encoding\?q\?$1\?=/;
        return $_;

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index ce26ea4ac53a4608f6f8234b67868a9cc85be7f8..2ce24cd5a613a2f218f8a486a4ad4c15db29e695 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -533,7 +533,7 @@ test_expect_success 'utf8 Cc is rfc2047 encoded' '
        --smtp-server="$(pwd)/fake.sendmail" \
        outdir/*.patch &&
        grep "^Cc:" msgtxt1 |
        --smtp-server="$(pwd)/fake.sendmail" \
        outdir/*.patch &&
        grep "^Cc:" msgtxt1 |

-       grep "=?utf-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@example.com>"
+       grep "=?UTF-8?q?=C3=A0=C3=A9=C3=AC=C3=B6=C3=BA?= <utf8@example.com>"

 '
 
 test_expect_success '--compose adds MIME for utf8 body' '
 '
 
 test_expect_success '--compose adds MIME for utf8 body' '


@@ -550,7 +550,7 @@ test_expect_success '--compose adds MIME for utf8 body' '
          --smtp-server="$(pwd)/fake.sendmail" \
          $patches &&
        grep "^utf8 body" msgtxt1 &&
          --smtp-server="$(pwd)/fake.sendmail" \
          $patches &&
        grep "^utf8 body" msgtxt1 &&

-       grep "^Content-Type: text/plain; charset=utf-8" msgtxt1
+       grep "^Content-Type: text/plain; charset=UTF-8" msgtxt1

 '
 
 test_expect_success '--compose respects user mime type' '
 '
 
 test_expect_success '--compose respects user mime type' '


@@ -573,7 +573,7 @@ test_expect_success '--compose respects user mime type' '
          $patches &&
        grep "^utf8 body" msgtxt1 &&
        grep "^Content-Type: text/plain; charset=iso-8859-1" msgtxt1 &&
          $patches &&
        grep "^utf8 body" msgtxt1 &&
        grep "^Content-Type: text/plain; charset=iso-8859-1" msgtxt1 &&

-       ! grep "^Content-Type: text/plain; charset=utf-8" msgtxt1
+       ! grep "^Content-Type: text/plain; charset=UTF-8" msgtxt1

 '
 
 test_expect_success '--compose adds MIME for utf8 subject' '
 '
 
 test_expect_success '--compose adds MIME for utf8 subject' '


@@ -586,7 +586,7 @@ test_expect_success '--compose adds MIME for utf8 subject' '
          --smtp-server="$(pwd)/fake.sendmail" \
          $patches &&
        grep "^fake edit" msgtxt1 &&
          --smtp-server="$(pwd)/fake.sendmail" \
          $patches &&
        grep "^fake edit" msgtxt1 &&

-       grep "^Subject: =?utf-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1
+       grep "^Subject: =?UTF-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1

 '
 
 test_expect_success 'detects ambiguous reference/file conflict' '
 '
 
 test_expect_success 'detects ambiguous reference/file conflict' '