development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-05 00:58:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'jc/spell-id-in-both-caps-in-message-id'

Browse Source 
Consistently spell "Message-ID" as such, not "Message-Id".

* jc/spell-id-in-both-caps-in-message-id:
  e-mail workflow: Message-ID is spelled with ID in both capital letters
This commit is contained in:
Junio C Hamano 2023-04-11 13:49:12 -07:00
commit 647a2bb3ff
15 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/MyFirstContribution.txt
View File

@ -1171,21 +1171,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 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. 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 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 send-email`, or you can look it up on the
https://lore.kernel.org/git[mailing list]. Find your cover letter in 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: header. It should match:
---- ----
Message-Id: <foo.12345.author@example.com> Message-ID: <foo.12345.author@example.com>
---- ----
Your Message-Id is `<foo.12345.author@example.com>`. This example will be used Your Message-ID is `<foo.12345.author@example.com>`. This example will be used
below as well; make sure to replace it with the correct Message-Id for your 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 **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. 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 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 common practice in the mailing list to keep all CCs on a thread. You can add

4
Documentation/git-format-patch.txt
View File

@ -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 If given `--thread`, `git-format-patch` will generate `In-Reply-To` and
`References` headers to make the second and subsequent patch mails appear `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. reference.
OPTIONS OPTIONS
@ -163,7 +163,7 @@ include::diff-options.txt[]
--no-thread:: --no-thread::
Controls addition of `In-Reply-To` and `References` headers to Controls addition of `In-Reply-To` and `References` headers to
make the second and subsequent mails appear as replies to the 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. reference.
+ +
The optional <style> argument can be either `shallow` or `deep`. The optional <style> argument can be either `shallow` or `deep`.

2
Documentation/git-send-email.txt
View File

@ -93,7 +93,7 @@ See the CONFIGURATION section for `sendemail.multiEdit`.
--in-reply-to=<identifier>:: --in-reply-to=<identifier>::
Make the first mail (or all the mails with `--no-thread`) appear as a 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. provide a new patch series.
The second and subsequent emails will be sent as replies according to The second and subsequent emails will be sent as replies according to
the `--[no-]chain-reply-to` setting. the `--[no-]chain-reply-to` setting.

4
git-send-email.perl
View File

@ -1537,7 +1537,7 @@ sub send_message {
To: $to${ccline} To: $to${ccline}
Subject: $subject Subject: $subject
Date: $date Date: $date
Message-Id: $message_id Message-ID: $message_id
"; ";
if ($use_xmailer) { if ($use_xmailer) {
$header .= "X-Mailer: git-send-email $gitversion\n"; $header .= "X-Mailer: git-send-email $gitversion\n";
@ -1832,7 +1832,7 @@ sub process_file {
$has_mime_version = 1; $has_mime_version = 1;
push @xh, $_; push @xh, $_;
} }
elsif (/^Message-Id: (.*)/i) { elsif (/^Message-ID: (.*)/i) {
$message_id = $1; $message_id = $1;
} }
elsif (/^Content-Transfer-Encoding: (.*)/i) { elsif (/^Content-Transfer-Encoding: (.*)/i) {

2
log-tree.c
View File

@ -448,7 +448,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); fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
graph_show_oneline(opt->graph); graph_show_oneline(opt->graph);
if (opt->message_id) { 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); graph_show_oneline(opt->graph);
} }
if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {

4
mailinfo.c
View File

@ -599,7 +599,7 @@ static int check_header(struct mailinfo *mi,
ret = 1; ret = 1;
goto check_header_out; 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) if (mi->add_message_id)
mi->message_id = strbuf_detach(&sb, NULL); mi->message_id = strbuf_detach(&sb, NULL);
ret = 1; ret = 1;
@ -831,7 +831,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
if (patchbreak(line)) { if (patchbreak(line)) {
if (mi->message_id) if (mi->message_id)
strbuf_addf(&mi->log_message, strbuf_addf(&mi->log_message,
"Message-Id: %s\n", mi->message_id); "Message-ID: %s\n", mi->message_id);
return 1; return 1;
} }

56
t/t4014-format-patch.sh
View File

@ -455,13 +455,13 @@ test_expect_success 'no threading' '
cat >expect.thread <<EOF cat >expect.thread <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
--- ---
Message-Id: <1> Message-ID: <1>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
EOF EOF
@ -472,15 +472,15 @@ test_expect_success 'thread' '
cat >expect.in-reply-to <<EOF cat >expect.in-reply-to <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
In-Reply-To: <1> In-Reply-To: <1>
References: <1> References: <1>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <1> In-Reply-To: <1>
References: <1> References: <1>
--- ---
Message-Id: <3> Message-ID: <3>
In-Reply-To: <1> In-Reply-To: <1>
References: <1> References: <1>
EOF EOF
@ -492,17 +492,17 @@ test_expect_success 'thread in-reply-to' '
cat >expect.cover-letter <<EOF cat >expect.cover-letter <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
--- ---
Message-Id: <1> Message-ID: <1>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
--- ---
Message-Id: <3> Message-ID: <3>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
EOF EOF
@ -513,21 +513,21 @@ test_expect_success 'thread cover-letter' '
cat >expect.cl-irt <<EOF cat >expect.cl-irt <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
In-Reply-To: <1> In-Reply-To: <1>
References: <1> References: <1>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <0> In-Reply-To: <0>
References: <1> References: <1>
<0> <0>
--- ---
Message-Id: <3> Message-ID: <3>
In-Reply-To: <0> In-Reply-To: <0>
References: <1> References: <1>
<0> <0>
--- ---
Message-Id: <4> Message-ID: <4>
In-Reply-To: <0> In-Reply-To: <0>
References: <1> References: <1>
<0> <0>
@ -545,13 +545,13 @@ test_expect_success 'thread explicit shallow' '
cat >expect.deep <<EOF cat >expect.deep <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
--- ---
Message-Id: <1> Message-ID: <1>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <1> In-Reply-To: <1>
References: <0> References: <0>
<1> <1>
@ -563,16 +563,16 @@ test_expect_success 'thread deep' '
cat >expect.deep-irt <<EOF cat >expect.deep-irt <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
In-Reply-To: <1> In-Reply-To: <1>
References: <1> References: <1>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <0> In-Reply-To: <0>
References: <1> References: <1>
<0> <0>
--- ---
Message-Id: <3> Message-ID: <3>
In-Reply-To: <2> In-Reply-To: <2>
References: <1> References: <1>
<0> <0>
@ -586,18 +586,18 @@ test_expect_success 'thread deep in-reply-to' '
cat >expect.deep-cl <<EOF cat >expect.deep-cl <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
--- ---
Message-Id: <1> Message-ID: <1>
In-Reply-To: <0> In-Reply-To: <0>
References: <0> References: <0>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <1> In-Reply-To: <1>
References: <0> References: <0>
<1> <1>
--- ---
Message-Id: <3> Message-ID: <3>
In-Reply-To: <2> In-Reply-To: <2>
References: <0> References: <0>
<1> <1>
@ -610,22 +610,22 @@ test_expect_success 'thread deep cover-letter' '
cat >expect.deep-cl-irt <<EOF cat >expect.deep-cl-irt <<EOF
--- ---
Message-Id: <0> Message-ID: <0>
In-Reply-To: <1> In-Reply-To: <1>
References: <1> References: <1>
--- ---
Message-Id: <2> Message-ID: <2>
In-Reply-To: <0> In-Reply-To: <0>
References: <1> References: <1>
<0> <0>
--- ---
Message-Id: <3> Message-ID: <3>
In-Reply-To: <2> In-Reply-To: <2>
References: <1> References: <1>
<0> <0>
<2> <2>
--- ---
Message-Id: <4> Message-ID: <4>
In-Reply-To: <3> In-Reply-To: <3>
References: <1> References: <1>
<0> <0>

8
t/t4150-am.sh
View File

@ -103,7 +103,7 @@ test_expect_success setup '
git format-patch --stdout first >patch1 && git format-patch --stdout first >patch1 &&
{ {
echo "Message-Id: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>" && echo "Message-ID: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>" &&
echo "X-Fake-Field: Line One" && echo "X-Fake-Field: Line One" &&
echo "X-Fake-Field: Line Two" && echo "X-Fake-Field: Line Two" &&
echo "X-Fake-Field: Line Three" && echo "X-Fake-Field: Line Three" &&
@ -942,7 +942,7 @@ test_expect_success 'am --message-id really adds the message id' '
git am --message-id patch1.eml && git am --message-id patch1.eml &&
test_path_is_missing .git/rebase-apply && test_path_is_missing .git/rebase-apply &&
git cat-file commit HEAD | tail -n1 >actual && git cat-file commit HEAD | tail -n1 >actual &&
grep Message-Id patch1.eml >expected && grep Message-ID patch1.eml >expected &&
test_cmp expected actual test_cmp expected actual
' '
@ -954,7 +954,7 @@ test_expect_success 'am.messageid really adds the message id' '
git am patch1.eml && git am patch1.eml &&
test_path_is_missing .git/rebase-apply && test_path_is_missing .git/rebase-apply &&
git cat-file commit HEAD | tail -n1 >actual && git cat-file commit HEAD | tail -n1 >actual &&
grep Message-Id patch1.eml >expected && grep Message-ID patch1.eml >expected &&
test_cmp expected actual test_cmp expected actual
' '
@ -965,7 +965,7 @@ test_expect_success 'am --message-id -s signs off after the message id' '
git am -s --message-id patch1.eml && git am -s --message-id patch1.eml &&
test_path_is_missing .git/rebase-apply && test_path_is_missing .git/rebase-apply &&
git cat-file commit HEAD | tail -n2 | head -n1 >actual && 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 test_cmp expected actual
' '

2
t/t4258/mbox
View File

@ -2,7 +2,7 @@ From: A U Thor <mail@example.com>
To: list@example.org To: list@example.org
Subject: [PATCH v2] sample Subject: [PATCH v2] sample
Date: Mon, 3 Aug 2020 22:40:55 +0700 Date: Mon, 3 Aug 2020 22:40:55 +0700
Message-Id: <msg-id@example.com> Message-ID: <msg-id@example.com>
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64 Content-Transfer-Encoding: base64

2
t/t5100/msg0002
View File

@ -3,7 +3,7 @@ message:
From: Nit Picker <nit.picker@example.net> From: Nit Picker <nit.picker@example.net>
Subject: foo is too old Subject: foo is too old
Message-Id: <nitpicker.12121212@example.net> Message-ID: <nitpicker.12121212@example.net>
Hopefully this would fix the problem stated there. Hopefully this would fix the problem stated there.

2
t/t5100/msg0003
View File

@ -3,7 +3,7 @@ message:
From: Nit Picker <nit.picker@example.net> From: Nit Picker <nit.picker@example.net>
Subject: foo is too old Subject: foo is too old
Message-Id: <nitpicker.12121212@example.net> Message-ID: <nitpicker.12121212@example.net>
Hopefully this would fix the problem stated there. Hopefully this would fix the problem stated there.

2
t/t5100/msg0012--message-id
View File

@ -5,4 +5,4 @@ docutils заменён на python-docutils
python-docutils. В то время как сам rest2web не нужен. python-docutils. В то время как сам rest2web не нужен.
Signed-off-by: Dmitriy Blinov <bda@mnsspb.ru> Signed-off-by: Dmitriy Blinov <bda@mnsspb.ru>
Message-Id: <1226501681-24923-1-git-send-email-bda@mnsspb.ru> Message-ID: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>

4
t/t5100/quoted-cr.mbox
View File

@ -3,7 +3,7 @@ From: A U Thor <mail@example.com>
To: list@example.org To: list@example.org
Subject: [PATCH v2] sample Subject: [PATCH v2] sample
Date: Mon, 3 Aug 2020 22:40:55 +0700 Date: Mon, 3 Aug 2020 22:40:55 +0700
Message-Id: <msg-id@example.com> Message-ID: <msg-id@example.com>
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64 Content-Transfer-Encoding: base64
@ -27,7 +27,7 @@ From: A U Thor <mail@example.com>
To: list@example.org To: list@example.org
Subject: [PATCH v2] sample Subject: [PATCH v2] sample
Date: Mon, 3 Aug 2020 22:40:55 +0700 Date: Mon, 3 Aug 2020 22:40:55 +0700
Message-Id: <msg-id2@example.com> Message-ID: <msg-id2@example.com>
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64 Content-Transfer-Encoding: base64

6
t/t5100/sample.mbox
View File

@ -35,7 +35,7 @@ message:
From: Nit Picker <nit.picker@example.net> From: Nit Picker <nit.picker@example.net>
Subject: foo is too old Subject: foo is too old
Message-Id: <nitpicker.12121212@example.net> Message-ID: <nitpicker.12121212@example.net>
Hopefully this would fix the problem stated there. Hopefully this would fix the problem stated there.
@ -78,7 +78,7 @@ message:
From: Nit Picker <nit.picker@example.net> From: Nit Picker <nit.picker@example.net>
Subject: foo is too old Subject: foo is too old
Message-Id: <nitpicker.12121212@example.net> Message-ID: <nitpicker.12121212@example.net>
Hopefully this would fix the problem stated there. Hopefully this would fix the problem stated there.
@ -508,7 +508,7 @@ From bda@mnsspb.ru Wed Nov 12 17:54:41 2008
From: Dmitriy Blinov <bda@mnsspb.ru> From: Dmitriy Blinov <bda@mnsspb.ru>
To: navy-patches@dinar.mns.mnsspb.ru To: navy-patches@dinar.mns.mnsspb.ru
Date: Wed, 12 Nov 2008 17:54:41 +0300 Date: Wed, 12 Nov 2008 17:54:41 +0300
Message-Id: <1226501681-24923-1-git-send-email-bda@mnsspb.ru> Message-ID: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>
X-Mailer: git-send-email 1.5.6.5 X-Mailer: git-send-email 1.5.6.5
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; Content-Type: text/plain;

38
t/t9001-send-email.sh
View File

@ -12,7 +12,7 @@ PREREQ="PERL"
replace_variable_fields () { replace_variable_fields () {
sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \ 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/" -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
} }
@ -225,7 +225,7 @@ Cc: cc@example.com,
two@example.com two@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
In-Reply-To: <unique-message-id@example.com> In-Reply-To: <unique-message-id@example.com>
References: <unique-message-id@example.com> References: <unique-message-id@example.com>
@ -617,7 +617,7 @@ test_expect_success $PREREQ 'In-Reply-To without --chain-reply-to' '
sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt1 >actual && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt1 >actual &&
test_cmp expect actual && test_cmp expect actual &&
# Second and subsequent messages are replies to the first one # 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 && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt2 >actual &&
test_cmp expect actual && test_cmp expect actual &&
sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt3 >actual && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt3 >actual &&
@ -637,10 +637,10 @@ test_expect_success $PREREQ 'In-Reply-To with --chain-reply-to' '
2>errors && 2>errors &&
sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt1 >actual && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt1 >actual &&
test_cmp expect 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 && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt2 >actual &&
test_cmp expect 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 && sed -n -e "s/^In-Reply-To: *\(.*\)/\1/p" msgtxt3 >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -713,7 +713,7 @@ Cc: cc@example.com,
two@example.com two@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -759,7 +759,7 @@ Cc: A <author@example.com>,
two@example.com two@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -796,7 +796,7 @@ Cc: A <author@example.com>,
C O Mitter <committer@example.com> C O Mitter <committer@example.com>
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -824,7 +824,7 @@ From: Example <from@example.com>
To: to@example.com To: to@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -860,7 +860,7 @@ Cc: A <author@example.com>,
cc-cmd@example.com cc-cmd@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -893,7 +893,7 @@ Cc: A <author@example.com>,
two@example.com two@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -926,7 +926,7 @@ Cc: A <author@example.com>,
two@example.com two@example.com
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -963,7 +963,7 @@ Cc: A <author@example.com>,
C O Mitter <committer@example.com> C O Mitter <committer@example.com>
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -993,7 +993,7 @@ Cc: A <author@example.com>,
C O Mitter <committer@example.com> C O Mitter <committer@example.com>
Subject: [PATCH 1/1] Second. Subject: [PATCH 1/1] Second.
Date: DATE-STRING Date: DATE-STRING
Message-Id: MESSAGE-ID-STRING Message-ID: MESSAGE-ID-STRING
X-Mailer: X-MAILER-STRING X-Mailer: X-MAILER-STRING
MIME-Version: 1.0 MIME-Version: 1.0
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
@ -1478,7 +1478,7 @@ test_expect_success $PREREQ 'To headers from files reset each patch' '
test_expect_success $PREREQ 'setup expect' ' test_expect_success $PREREQ 'setup expect' '
cat >email-using-8bit <<\EOF cat >email-using-8bit <<\EOF
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
Message-Id: <bogus-message-id@example.com> Message-ID: <bogus-message-id@example.com>
From: author@example.com From: author@example.com
Date: Sat, 12 Jun 2010 15:53:58 +0200 Date: Sat, 12 Jun 2010 15:53:58 +0200
Subject: subject goes here Subject: subject goes here
@ -1564,7 +1564,7 @@ test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
test_expect_success $PREREQ 'setup expect' ' test_expect_success $PREREQ 'setup expect' '
cat >email-using-8bit <<-\EOF cat >email-using-8bit <<-\EOF
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
Message-Id: <bogus-message-id@example.com> Message-ID: <bogus-message-id@example.com>
From: author@example.com From: author@example.com
Date: Sat, 12 Jun 2010 15:53:58 +0200 Date: Sat, 12 Jun 2010 15:53:58 +0200
Subject: Dieser Betreff enthält auch einen Umlaut! Subject: Dieser Betreff enthält auch einen Umlaut!
@ -1593,7 +1593,7 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
test_expect_success $PREREQ 'setup expect' ' test_expect_success $PREREQ 'setup expect' '
cat >email-using-8bit <<-\EOF cat >email-using-8bit <<-\EOF
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
Message-Id: <bogus-message-id@example.com> Message-ID: <bogus-message-id@example.com>
From: A U Thor <author@example.com> From: A U Thor <author@example.com>
Date: Sat, 12 Jun 2010 15:53:58 +0200 Date: Sat, 12 Jun 2010 15:53:58 +0200
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8
@ -1674,7 +1674,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
test_expect_success $PREREQ 'setup expect' ' test_expect_success $PREREQ 'setup expect' '
cat >email-using-qp <<-\EOF cat >email-using-qp <<-\EOF
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
Message-Id: <bogus-message-id@example.com> Message-ID: <bogus-message-id@example.com>
From: A U Thor <author@example.com> From: A U Thor <author@example.com>
Date: Sat, 12 Jun 2010 15:53:58 +0200 Date: Sat, 12 Jun 2010 15:53:58 +0200
MIME-Version: 1.0 MIME-Version: 1.0
@ -1700,7 +1700,7 @@ test_expect_success $PREREQ 'convert from quoted-printable to base64' '
test_expect_success $PREREQ 'setup expect' " test_expect_success $PREREQ 'setup expect' "
tr -d '\\015' | tr '%' '\\015' >email-using-crlf <<EOF tr -d '\\015' | tr '%' '\\015' >email-using-crlf <<EOF
From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001 From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
Message-Id: <bogus-message-id@example.com> Message-ID: <bogus-message-id@example.com>
From: A U Thor <author@example.com> From: A U Thor <author@example.com>
Date: Sat, 12 Jun 2010 15:53:58 +0200 Date: Sat, 12 Jun 2010 15:53:58 +0200
Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8