Eric Wong <e@xxxxxxxxx> writes: > git send-email's capitalization does annoy me and I've looked > into changing it; but there's a bunch of tests and probably > dependent code that also need to be updated... It does annoy me, too, and I do not mind if it gets "fixed", but I do not know if the cost for vetting a bulk update like that is worth it. There is another one outside send-email in log-tree.c that is responsible for output from format-patch. Here is the extent of damage in my trial change that seems to pass the tests locally. Documentation/MyFirstContribution.txt | 14 ++++----- Documentation/git-format-patch.txt | 4 +-- Documentation/git-send-email.txt | 2 +- git-send-email.perl | 4 +-- log-tree.c | 2 +- mailinfo.c | 4 +-- t/t4014-format-patch.sh | 56 +++++++++++++++++------------------ t/t4150-am.sh | 8 ++--- t/t4258/mbox | 2 +- t/t5100/msg0002 | 2 +- t/t5100/msg0003 | 2 +- t/t5100/msg0012--message-id | 2 +- t/t5100/quoted-cr.mbox | 4 +-- t/t5100/sample.mbox | 6 ++-- t/t9001-send-email.sh | 38 ++++++++++++------------ 15 files changed, 75 insertions(+), 75 deletions(-) diff --git i/Documentation/MyFirstContribution.txt w/Documentation/MyFirstContribution.txt index b20bc8e914..91cb204d52 100644 --- i/Documentation/MyFirstContribution.txt +++ w/Documentation/MyFirstContribution.txt @@ -1071,21 +1071,21 @@ between your last version and now, if it's something significant. You do not need the exact same body in your second cover letter; focus on explaining to reviewers the changes you've made that may not be as visible. -You will also need to go and find the Message-Id of your previous cover letter. +You will also need to go and find the Message-ID of your previous cover letter. You can either note it when you send the first series, from the output of `git send-email`, or you can look it up on the https://lore.kernel.org/git[mailing list]. Find your cover letter in the -archives, click on it, then click "permalink" or "raw" to reveal the Message-Id +archives, click on it, then click "permalink" or "raw" to reveal the Message-ID header. It should match: ---- -Message-Id: <foo.12345.author@xxxxxxxxxxx> +Message-ID: <foo.12345.author@xxxxxxxxxxx> ---- -Your Message-Id is `<foo.12345.author@xxxxxxxxxxx>`. This example will be used -below as well; make sure to replace it with the correct Message-Id for your -**previous cover letter** - that is, if you're sending v2, use the Message-Id -from v1; if you're sending v3, use the Message-Id from v2. +Your Message-ID is `<foo.12345.author@xxxxxxxxxxx>`. This example will be used +below as well; make sure to replace it with the correct Message-ID for your +**previous cover letter** - that is, if you're sending v2, use the Message-ID +from v1; if you're sending v3, use the Message-ID from v2. While you're looking at the email, you should also note who is CC'd, as it's common practice in the mailing list to keep all CCs on a thread. You can add diff --git i/Documentation/git-format-patch.txt w/Documentation/git-format-patch.txt index 113eabc107..daf911f249 100644 --- i/Documentation/git-format-patch.txt +++ w/Documentation/git-format-patch.txt @@ -99,7 +99,7 @@ To omit patch numbers from the subject, use `-N`. If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear -as replies to the first mail; this also generates a `Message-Id` header to +as replies to the first mail; this also generates a `Message-ID` header to reference. OPTIONS @@ -163,7 +163,7 @@ include::diff-options.txt[] --no-thread:: Controls addition of `In-Reply-To` and `References` headers to make the second and subsequent mails appear as replies to the - first. Also controls generation of the `Message-Id` header to + first. Also controls generation of the `Message-ID` header to reference. + The optional <style> argument can be either `shallow` or `deep`. diff --git i/Documentation/git-send-email.txt w/Documentation/git-send-email.txt index 3db4eab4ba..086f132229 100644 --- i/Documentation/git-send-email.txt +++ w/Documentation/git-send-email.txt @@ -91,7 +91,7 @@ See the CONFIGURATION section for `sendemail.multiEdit`. --in-reply-to=<identifier>:: Make the first mail (or all the mails with `--no-thread`) appear as a - reply to the given Message-Id, which avoids breaking threads to + reply to the given Message-ID, which avoids breaking threads to provide a new patch series. The second and subsequent emails will be sent as replies according to the `--[no-]chain-reply-to` setting. diff --git i/git-send-email.perl w/git-send-email.perl index 5262d88ee3..a61134c7d3 100755 --- i/git-send-email.perl +++ w/git-send-email.perl @@ -1494,7 +1494,7 @@ sub send_message { To: $to${ccline} Subject: $subject Date: $date -Message-Id: $message_id +Message-ID: $message_id "; if ($use_xmailer) { $header .= "X-Mailer: git-send-email $gitversion\n"; @@ -1789,7 +1789,7 @@ sub process_file { $has_mime_version = 1; push @xh, $_; } - elsif (/^Message-Id: (.*)/i) { + elsif (/^Message-ID: (.*)/i) { $message_id = $1; } elsif (/^Content-Transfer-Encoding: (.*)/i) { diff --git i/log-tree.c w/log-tree.c index 644893fd8c..818cea5f12 100644 --- i/log-tree.c +++ w/log-tree.c @@ -428,7 +428,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name); graph_show_oneline(opt->graph); if (opt->message_id) { - fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id); + fprintf(opt->diffopt.file, "Message-ID: <%s>\n", opt->message_id); graph_show_oneline(opt->graph); } if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { diff --git i/mailinfo.c w/mailinfo.c index 02f6f95357..855349cc0e 100644 --- i/mailinfo.c +++ w/mailinfo.c @@ -597,7 +597,7 @@ static int check_header(struct mailinfo *mi, ret = 1; goto check_header_out; } - if (parse_header(line, "Message-Id", mi, &sb)) { + if (parse_header(line, "Message-ID", mi, &sb)) { if (mi->add_message_id) mi->message_id = strbuf_detach(&sb, NULL); ret = 1; @@ -829,7 +829,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line) if (patchbreak(line)) { if (mi->message_id) strbuf_addf(&mi->log_message, - "Message-Id: %s\n", mi->message_id); + "Message-ID: %s\n", mi->message_id); return 1; } diff --git i/t/t4014-format-patch.sh w/t/t4014-format-patch.sh index 712d4b5ddf..973899d165 100755 --- i/t/t4014-format-patch.sh +++ w/t/t4014-format-patch.sh @@ -445,13 +445,13 @@ test_expect_success 'no threading' ' cat >expect.thread <<EOF --- -Message-Id: <0> +Message-ID: <0> --- -Message-Id: <1> +Message-ID: <1> In-Reply-To: <0> References: <0> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <0> References: <0> EOF @@ -462,15 +462,15 @@ test_expect_success 'thread' ' cat >expect.in-reply-to <<EOF --- -Message-Id: <0> +Message-ID: <0> In-Reply-To: <1> References: <1> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <1> References: <1> --- -Message-Id: <3> +Message-ID: <3> In-Reply-To: <1> References: <1> EOF @@ -482,17 +482,17 @@ test_expect_success 'thread in-reply-to' ' cat >expect.cover-letter <<EOF --- -Message-Id: <0> +Message-ID: <0> --- -Message-Id: <1> +Message-ID: <1> In-Reply-To: <0> References: <0> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <0> References: <0> --- -Message-Id: <3> +Message-ID: <3> In-Reply-To: <0> References: <0> EOF @@ -503,21 +503,21 @@ test_expect_success 'thread cover-letter' ' cat >expect.cl-irt <<EOF --- -Message-Id: <0> +Message-ID: <0> In-Reply-To: <1> References: <1> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <0> References: <1> <0> --- -Message-Id: <3> +Message-ID: <3> In-Reply-To: <0> References: <1> <0> --- -Message-Id: <4> +Message-ID: <4> In-Reply-To: <0> References: <1> <0> @@ -535,13 +535,13 @@ test_expect_success 'thread explicit shallow' ' cat >expect.deep <<EOF --- -Message-Id: <0> +Message-ID: <0> --- -Message-Id: <1> +Message-ID: <1> In-Reply-To: <0> References: <0> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <1> References: <0> <1> @@ -553,16 +553,16 @@ test_expect_success 'thread deep' ' cat >expect.deep-irt <<EOF --- -Message-Id: <0> +Message-ID: <0> In-Reply-To: <1> References: <1> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <0> References: <1> <0> --- -Message-Id: <3> +Message-ID: <3> In-Reply-To: <2> References: <1> <0> @@ -576,18 +576,18 @@ test_expect_success 'thread deep in-reply-to' ' cat >expect.deep-cl <<EOF --- -Message-Id: <0> +Message-ID: <0> --- -Message-Id: <1> +Message-ID: <1> In-Reply-To: <0> References: <0> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <1> References: <0> <1> --- -Message-Id: <3> +Message-ID: <3> In-Reply-To: <2> References: <0> <1> @@ -600,22 +600,22 @@ test_expect_success 'thread deep cover-letter' ' cat >expect.deep-cl-irt <<EOF --- -Message-Id: <0> +Message-ID: <0> In-Reply-To: <1> References: <1> --- -Message-Id: <2> +Message-ID: <2> In-Reply-To: <0> References: <1> <0> --- -Message-Id: <3> +Message-ID: <3> In-Reply-To: <2> References: <1> <0> <2> --- -Message-Id: <4> +Message-ID: <4> In-Reply-To: <3> References: <1> <0> diff --git i/t/t4150-am.sh w/t/t4150-am.sh index 2aaaa0d7de..f41418c6e9 100755 --- i/t/t4150-am.sh +++ w/t/t4150-am.sh @@ -103,7 +103,7 @@ test_expect_success setup ' git format-patch --stdout first >patch1 && { - echo "Message-Id: <1226501681-24923-1-git-send-email-bda@xxxxxxxxx>" && + echo "Message-ID: <1226501681-24923-1-git-send-email-bda@xxxxxxxxx>" && echo "X-Fake-Field: Line One" && echo "X-Fake-Field: Line Two" && echo "X-Fake-Field: Line Three" && @@ -916,7 +916,7 @@ test_expect_success 'am --message-id really adds the message id' ' git am --message-id patch1.eml && test_path_is_missing .git/rebase-apply && git cat-file commit HEAD | tail -n1 >actual && - grep Message-Id patch1.eml >expected && + grep Message-ID patch1.eml >expected && test_cmp expected actual ' @@ -928,7 +928,7 @@ test_expect_success 'am.messageid really adds the message id' ' git am patch1.eml && test_path_is_missing .git/rebase-apply && git cat-file commit HEAD | tail -n1 >actual && - grep Message-Id patch1.eml >expected && + grep Message-ID patch1.eml >expected && test_cmp expected actual ' @@ -939,7 +939,7 @@ test_expect_success 'am --message-id -s signs off after the message id' ' git am -s --message-id patch1.eml && test_path_is_missing .git/rebase-apply && git cat-file commit HEAD | tail -n2 | head -n1 >actual && - grep Message-Id patch1.eml >expected && + grep Message-ID patch1.eml >expected && test_cmp expected actual ' diff --git i/t/t4258/mbox w/t/t4258/mbox index c62819f3d2..1ae528ba78 100644 --- i/t/t4258/mbox +++ w/t/t4258/mbox @@ -2,7 +2,7 @@ From: A U Thor <mail@xxxxxxxxxxx> To: list@xxxxxxxxxxx Subject: [PATCH v2] sample Date: Mon, 3 Aug 2020 22:40:55 +0700 -Message-Id: <msg-id@xxxxxxxxxxx> +Message-ID: <msg-id@xxxxxxxxxxx> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 diff --git i/t/t5100/msg0002 w/t/t5100/msg0002 index e2546ec733..1089382425 100644 --- i/t/t5100/msg0002 +++ w/t/t5100/msg0002 @@ -3,7 +3,7 @@ message: From: Nit Picker <nit.picker@xxxxxxxxxxx> Subject: foo is too old -Message-Id: <nitpicker.12121212@xxxxxxxxxxx> +Message-ID: <nitpicker.12121212@xxxxxxxxxxx> Hopefully this would fix the problem stated there. diff --git i/t/t5100/msg0003 w/t/t5100/msg0003 index 1ac68101b1..3402b534a6 100644 --- i/t/t5100/msg0003 +++ w/t/t5100/msg0003 @@ -3,7 +3,7 @@ message: From: Nit Picker <nit.picker@xxxxxxxxxxx> Subject: foo is too old -Message-Id: <nitpicker.12121212@xxxxxxxxxxx> +Message-ID: <nitpicker.12121212@xxxxxxxxxxx> Hopefully this would fix the problem stated there. diff --git i/t/t5100/msg0012--message-id w/t/t5100/msg0012--message-id index 376e26e9ae..44482958ce 100644 --- i/t/t5100/msg0012--message-id +++ w/t/t5100/msg0012--message-id @@ -5,4 +5,4 @@ docutils заменён на python-docutils python-docutils. В то время как сам rest2web не нужен. Signed-off-by: Dmitriy Blinov <bda@xxxxxxxxx> -Message-Id: <1226501681-24923-1-git-send-email-bda@xxxxxxxxx> +Message-ID: <1226501681-24923-1-git-send-email-bda@xxxxxxxxx> diff --git i/t/t5100/quoted-cr.mbox w/t/t5100/quoted-cr.mbox index 909021bb7a..a529d4de08 100644 --- i/t/t5100/quoted-cr.mbox +++ w/t/t5100/quoted-cr.mbox @@ -3,7 +3,7 @@ From: A U Thor <mail@xxxxxxxxxxx> To: list@xxxxxxxxxxx Subject: [PATCH v2] sample Date: Mon, 3 Aug 2020 22:40:55 +0700 -Message-Id: <msg-id@xxxxxxxxxxx> +Message-ID: <msg-id@xxxxxxxxxxx> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 @@ -27,7 +27,7 @@ From: A U Thor <mail@xxxxxxxxxxx> To: list@xxxxxxxxxxx Subject: [PATCH v2] sample Date: Mon, 3 Aug 2020 22:40:55 +0700 -Message-Id: <msg-id2@xxxxxxxxxxx> +Message-ID: <msg-id2@xxxxxxxxxxx> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 diff --git i/t/t5100/sample.mbox w/t/t5100/sample.mbox index 6d4d0e4474..4a54ee5171 100644 --- i/t/t5100/sample.mbox +++ w/t/t5100/sample.mbox @@ -35,7 +35,7 @@ message: From: Nit Picker <nit.picker@xxxxxxxxxxx> Subject: foo is too old -Message-Id: <nitpicker.12121212@xxxxxxxxxxx> +Message-ID: <nitpicker.12121212@xxxxxxxxxxx> Hopefully this would fix the problem stated there. @@ -78,7 +78,7 @@ message: From: Nit Picker <nit.picker@xxxxxxxxxxx> Subject: foo is too old -Message-Id: <nitpicker.12121212@xxxxxxxxxxx> +Message-ID: <nitpicker.12121212@xxxxxxxxxxx> Hopefully this would fix the problem stated there. @@ -508,7 +508,7 @@ From bda@xxxxxxxxx Wed Nov 12 17:54:41 2008 From: Dmitriy Blinov <bda@xxxxxxxxx> To: navy-patches@xxxxxxxxxxxxxxxxxxx Date: Wed, 12 Nov 2008 17:54:41 +0300 -Message-Id: <1226501681-24923-1-git-send-email-bda@xxxxxxxxx> +Message-ID: <1226501681-24923-1-git-send-email-bda@xxxxxxxxx> X-Mailer: git-send-email 1.5.6.5 MIME-Version: 1.0 Content-Type: text/plain; diff --git i/t/t9001-send-email.sh w/t/t9001-send-email.sh index aa0c20499b..ce09cf1fe3 100755 --- i/t/t9001-send-email.sh +++ w/t/t9001-send-email.sh @@ -11,7 +11,7 @@ PREREQ="PERL" replace_variable_fields () { sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \ - -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \ + -e "s/^\(Message-ID:\).*/\1 MESSAGE-ID-STRING/" \ -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" } @@ -224,7 +224,7 @@ Cc: cc@xxxxxxxxxxx, two@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING In-Reply-To: <unique-message-id@xxxxxxxxxxx> References: <unique-message-id@xxxxxxxxxxx> @@ -616,7 +616,7 @@ test_expect_success $PREREQ 'In-Reply-To without --chain-reply-to' ' sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt1 >actual && test_cmp expect actual && # Second and subsequent messages are replies to the first one - sed -n -e "s/^Message-Id: *\(.*\)/\1/p" msgtxt1 >expect && + sed -n -e "s/^Message-ID: *\(.*\)/\1/p" msgtxt1 >expect && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt2 >actual && test_cmp expect actual && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt3 >actual && @@ -636,10 +636,10 @@ test_expect_success $PREREQ 'In-Reply-To with --chain-reply-to' ' 2>errors && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt1 >actual && test_cmp expect actual && - sed -n -e "s/^Message-Id: *\(.*\)/\1/p" msgtxt1 >expect && + sed -n -e "s/^Message-ID: *\(.*\)/\1/p" msgtxt1 >expect && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt2 >actual && test_cmp expect actual && - sed -n -e "s/^Message-Id: *\(.*\)/\1/p" msgtxt2 >expect && + sed -n -e "s/^Message-ID: *\(.*\)/\1/p" msgtxt2 >expect && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt3 >actual && test_cmp expect actual ' @@ -712,7 +712,7 @@ Cc: cc@xxxxxxxxxxx, two@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -758,7 +758,7 @@ Cc: A <author@xxxxxxxxxxx>, two@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -795,7 +795,7 @@ Cc: A <author@xxxxxxxxxxx>, C O Mitter <committer@xxxxxxxxxxx> Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -823,7 +823,7 @@ From: Example <from@xxxxxxxxxxx> To: to@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -859,7 +859,7 @@ Cc: A <author@xxxxxxxxxxx>, cc-cmd@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -892,7 +892,7 @@ Cc: A <author@xxxxxxxxxxx>, two@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -925,7 +925,7 @@ Cc: A <author@xxxxxxxxxxx>, two@xxxxxxxxxxx Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -962,7 +962,7 @@ Cc: A <author@xxxxxxxxxxx>, C O Mitter <committer@xxxxxxxxxxx> Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -992,7 +992,7 @@ Cc: A <author@xxxxxxxxxxx>, C O Mitter <committer@xxxxxxxxxxx> Subject: [PATCH 1/1] Second. Date: DATE-STRING -Message-Id: MESSAGE-ID-STRING +Message-ID: MESSAGE-ID-STRING X-Mailer: X-MAILER-STRING MIME-Version: 1.0 Content-Transfer-Encoding: 8bit @@ -1477,7 +1477,7 @@ test_expect_success $PREREQ 'To headers from files reset each patch' ' test_expect_success $PREREQ 'setup expect' ' cat >email-using-8bit <<\EOF From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 -Message-Id: <bogus-message-id@xxxxxxxxxxx> +Message-ID: <bogus-message-id@xxxxxxxxxxx> From: author@xxxxxxxxxxx Date: Sat, 12 Jun 2010 15:53:58 +0200 Subject: subject goes here @@ -1563,7 +1563,7 @@ test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' ' test_expect_success $PREREQ 'setup expect' ' cat >email-using-8bit <<-\EOF From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 - Message-Id: <bogus-message-id@xxxxxxxxxxx> + Message-ID: <bogus-message-id@xxxxxxxxxxx> From: author@xxxxxxxxxxx Date: Sat, 12 Jun 2010 15:53:58 +0200 Subject: Dieser Betreff enthält auch einen Umlaut! @@ -1592,7 +1592,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' ' test_expect_success $PREREQ 'setup expect' ' cat >email-using-8bit <<-\EOF From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 - Message-Id: <bogus-message-id@xxxxxxxxxxx> + Message-ID: <bogus-message-id@xxxxxxxxxxx> From: A U Thor <author@xxxxxxxxxxx> Date: Sat, 12 Jun 2010 15:53:58 +0200 Content-Type: text/plain; charset=UTF-8 @@ -1673,7 +1673,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' ' test_expect_success $PREREQ 'setup expect' ' cat >email-using-qp <<-\EOF From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 - Message-Id: <bogus-message-id@xxxxxxxxxxx> + Message-ID: <bogus-message-id@xxxxxxxxxxx> From: A U Thor <author@xxxxxxxxxxx> Date: Sat, 12 Jun 2010 15:53:58 +0200 MIME-Version: 1.0 @@ -1699,7 +1699,7 @@ test_expect_success $PREREQ 'convert from quoted-printable to base64' ' test_expect_success $PREREQ 'setup expect' " tr -d '\\015' | tr '%' '\\015' >email-using-crlf <<EOF From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 -Message-Id: <bogus-message-id@xxxxxxxxxxx> +Message-ID: <bogus-message-id@xxxxxxxxxxx> From: A U Thor <author@xxxxxxxxxxx> Date: Sat, 12 Jun 2010 15:53:58 +0200 Content-Type: text/plain; charset=UTF-8
