Skip to content

Commit 647a2bb

Browse files
gitstergitster
committed
Merge branch 'jc/spell-id-in-both-caps-in-message-id'
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
2 parents d02343b + ba4324c commit 647a2bb

15 files changed

+75
-75
lines changed

‎Documentation/MyFirstContribution.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,21 +1171,21 @@ between your last version and now, if it's something significant. You do not
11711171
need the exact same body in your second cover letter; focus on explaining to
11721172
reviewers the changes you've made that may not be as visible.
11731173

1174-
You will also need to go and find the Message-Id of your previous cover letter.
1174+
You will also need to go and find the Message-ID of your previous cover letter.
11751175
You can either note it when you send the first series, from the output of `git
11761176
send-email`, or you can look it up on the
11771177
https://lore.kernel.org/git[mailing list]. Find your cover letter in the
1178-
archives, click on it, then click "permalink" or "raw" to reveal the Message-Id
1178+
archives, click on it, then click "permalink" or "raw" to reveal the Message-ID
11791179
header. It should match:
11801180

11811181
----
1182-
Message-Id: <[email protected]>
1182+
Message-ID: <[email protected]>
11831183
----
11841184

1185-
Your Message-Id is `<[email protected]>`. This example will be used
1186-
below as well; make sure to replace it with the correct Message-Id for your
1187-
**previous cover letter** - that is, if you're sending v2, use the Message-Id
1188-
from v1; if you're sending v3, use the Message-Id from v2.
1185+
Your Message-ID is `<[email protected]>`. This example will be used
1186+
below as well; make sure to replace it with the correct Message-ID for your
1187+
**previous cover letter** - that is, if you're sending v2, use the Message-ID
1188+
from v1; if you're sending v3, use the Message-ID from v2.
11891189

11901190
While you're looking at the email, you should also note who is CC'd, as it's
11911191
common practice in the mailing list to keep all CCs on a thread. You can add

‎Documentation/git-format-patch.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ To omit patch numbers from the subject, use `-N`.
9999

100100
If given `--thread`, `git-format-patch` will generate `In-Reply-To` and
101101
`References` headers to make the second and subsequent patch mails appear
102-
as replies to the first mail; this also generates a `Message-Id` header to
102+
as replies to the first mail; this also generates a `Message-ID` header to
103103
reference.
104104

105105
OPTIONS
@@ -163,7 +163,7 @@ include::diff-options.txt[]
163163
--no-thread::
164164
Controls addition of `In-Reply-To` and `References` headers to
165165
make the second and subsequent mails appear as replies to the
166-
first. Also controls generation of the `Message-Id` header to
166+
first. Also controls generation of the `Message-ID` header to
167167
reference.
168168
+
169169
The optional <style> argument can be either `shallow` or `deep`.

‎Documentation/git-send-email.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ See the CONFIGURATION section for `sendemail.multiEdit`.
9393

9494
--in-reply-to=<identifier>::
9595
Make the first mail (or all the mails with `--no-thread`) appear as a
96-
reply to the given Message-Id, which avoids breaking threads to
96+
reply to the given Message-ID, which avoids breaking threads to
9797
provide a new patch series.
9898
The second and subsequent emails will be sent as replies according to
9999
the `--[no-]chain-reply-to` setting.

‎git-send-email.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,7 +1537,7 @@ sub send_message {
15371537
To: $to${ccline}
15381538
Subject: $subject
15391539
Date: $date
1540-
Message-Id: $message_id
1540+
Message-ID: $message_id
15411541
";
15421542
if ($use_xmailer) {
15431543
$header .= "X-Mailer: git-send-email $gitversion\n";
@@ -1832,7 +1832,7 @@ sub process_file {
18321832
$has_mime_version = 1;
18331833
push @xh, $_;
18341834
}
1835-
elsif (/^Message-Id: (.*)/i) {
1835+
elsif (/^Message-ID: (.*)/i) {
18361836
$message_id = $1;
18371837
}
18381838
elsif (/^Content-Transfer-Encoding: (.*)/i) {

‎log-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
448448
fprintf(opt->diffopt.file, "From %s Mon Sep 17 00:00:00 2001\n", name);
449449
graph_show_oneline(opt->graph);
450450
if (opt->message_id) {
451-
fprintf(opt->diffopt.file, "Message-Id: <%s>\n", opt->message_id);
451+
fprintf(opt->diffopt.file, "Message-ID: <%s>\n", opt->message_id);
452452
graph_show_oneline(opt->graph);
453453
}
454454
if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) {

‎mailinfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ static int check_header(struct mailinfo *mi,
599599
ret = 1;
600600
goto check_header_out;
601601
}
602-
if (parse_header(line, "Message-Id", mi, &sb)) {
602+
if (parse_header(line, "Message-ID", mi, &sb)) {
603603
if (mi->add_message_id)
604604
mi->message_id = strbuf_detach(&sb, NULL);
605605
ret = 1;
@@ -831,7 +831,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
831831
if (patchbreak(line)) {
832832
if (mi->message_id)
833833
strbuf_addf(&mi->log_message,
834-
"Message-Id: %s\n", mi->message_id);
834+
"Message-ID: %s\n", mi->message_id);
835835
return 1;
836836
}
837837

‎t/t4014-format-patch.sh

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -455,13 +455,13 @@ test_expect_success 'no threading' '
455455

456456
cat >expect.thread <<EOF
457457
---
458-
Message-Id: <0>
458+
Message-ID: <0>
459459
---
460-
Message-Id: <1>
460+
Message-ID: <1>
461461
In-Reply-To: <0>
462462
References: <0>
463463
---
464-
Message-Id: <2>
464+
Message-ID: <2>
465465
In-Reply-To: <0>
466466
References: <0>
467467
EOF
@@ -472,15 +472,15 @@ test_expect_success 'thread' '
472472

473473
cat >expect.in-reply-to <<EOF
474474
---
475-
Message-Id: <0>
475+
Message-ID: <0>
476476
In-Reply-To: <1>
477477
References: <1>
478478
---
479-
Message-Id: <2>
479+
Message-ID: <2>
480480
In-Reply-To: <1>
481481
References: <1>
482482
---
483-
Message-Id: <3>
483+
Message-ID: <3>
484484
In-Reply-To: <1>
485485
References: <1>
486486
EOF
@@ -492,17 +492,17 @@ test_expect_success 'thread in-reply-to' '
492492

493493
cat >expect.cover-letter <<EOF
494494
---
495-
Message-Id: <0>
495+
Message-ID: <0>
496496
---
497-
Message-Id: <1>
497+
Message-ID: <1>
498498
In-Reply-To: <0>
499499
References: <0>
500500
---
501-
Message-Id: <2>
501+
Message-ID: <2>
502502
In-Reply-To: <0>
503503
References: <0>
504504
---
505-
Message-Id: <3>
505+
Message-ID: <3>
506506
In-Reply-To: <0>
507507
References: <0>
508508
EOF
@@ -513,21 +513,21 @@ test_expect_success 'thread cover-letter' '
513513

514514
cat >expect.cl-irt <<EOF
515515
---
516-
Message-Id: <0>
516+
Message-ID: <0>
517517
In-Reply-To: <1>
518518
References: <1>
519519
---
520-
Message-Id: <2>
520+
Message-ID: <2>
521521
In-Reply-To: <0>
522522
References: <1>
523523
<0>
524524
---
525-
Message-Id: <3>
525+
Message-ID: <3>
526526
In-Reply-To: <0>
527527
References: <1>
528528
<0>
529529
---
530-
Message-Id: <4>
530+
Message-ID: <4>
531531
In-Reply-To: <0>
532532
References: <1>
533533
<0>
@@ -545,13 +545,13 @@ test_expect_success 'thread explicit shallow' '
545545

546546
cat >expect.deep <<EOF
547547
---
548-
Message-Id: <0>
548+
Message-ID: <0>
549549
---
550-
Message-Id: <1>
550+
Message-ID: <1>
551551
In-Reply-To: <0>
552552
References: <0>
553553
---
554-
Message-Id: <2>
554+
Message-ID: <2>
555555
In-Reply-To: <1>
556556
References: <0>
557557
<1>
@@ -563,16 +563,16 @@ test_expect_success 'thread deep' '
563563

564564
cat >expect.deep-irt <<EOF
565565
---
566-
Message-Id: <0>
566+
Message-ID: <0>
567567
In-Reply-To: <1>
568568
References: <1>
569569
---
570-
Message-Id: <2>
570+
Message-ID: <2>
571571
In-Reply-To: <0>
572572
References: <1>
573573
<0>
574574
---
575-
Message-Id: <3>
575+
Message-ID: <3>
576576
In-Reply-To: <2>
577577
References: <1>
578578
<0>
@@ -586,18 +586,18 @@ test_expect_success 'thread deep in-reply-to' '
586586

587587
cat >expect.deep-cl <<EOF
588588
---
589-
Message-Id: <0>
589+
Message-ID: <0>
590590
---
591-
Message-Id: <1>
591+
Message-ID: <1>
592592
In-Reply-To: <0>
593593
References: <0>
594594
---
595-
Message-Id: <2>
595+
Message-ID: <2>
596596
In-Reply-To: <1>
597597
References: <0>
598598
<1>
599599
---
600-
Message-Id: <3>
600+
Message-ID: <3>
601601
In-Reply-To: <2>
602602
References: <0>
603603
<1>
@@ -610,22 +610,22 @@ test_expect_success 'thread deep cover-letter' '
610610

611611
cat >expect.deep-cl-irt <<EOF
612612
---
613-
Message-Id: <0>
613+
Message-ID: <0>
614614
In-Reply-To: <1>
615615
References: <1>
616616
---
617-
Message-Id: <2>
617+
Message-ID: <2>
618618
In-Reply-To: <0>
619619
References: <1>
620620
<0>
621621
---
622-
Message-Id: <3>
622+
Message-ID: <3>
623623
In-Reply-To: <2>
624624
References: <1>
625625
<0>
626626
<2>
627627
---
628-
Message-Id: <4>
628+
Message-ID: <4>
629629
In-Reply-To: <3>
630630
References: <1>
631631
<0>

‎t/t4150-am.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ test_expect_success setup '
103103
104104
git format-patch --stdout first >patch1 &&
105105
{
106-
echo "Message-Id: <[email protected]>" &&
106+
echo "Message-ID: <[email protected]>" &&
107107
echo "X-Fake-Field: Line One" &&
108108
echo "X-Fake-Field: Line Two" &&
109109
echo "X-Fake-Field: Line Three" &&
@@ -942,7 +942,7 @@ test_expect_success 'am --message-id really adds the message id' '
942942
git am --message-id patch1.eml &&
943943
test_path_is_missing .git/rebase-apply &&
944944
git cat-file commit HEAD | tail -n1 >actual &&
945-
grep Message-Id patch1.eml >expected &&
945+
grep Message-ID patch1.eml >expected &&
946946
test_cmp expected actual
947947
'
948948

@@ -954,7 +954,7 @@ test_expect_success 'am.messageid really adds the message id' '
954954
git am patch1.eml &&
955955
test_path_is_missing .git/rebase-apply &&
956956
git cat-file commit HEAD | tail -n1 >actual &&
957-
grep Message-Id patch1.eml >expected &&
957+
grep Message-ID patch1.eml >expected &&
958958
test_cmp expected actual
959959
'
960960

@@ -965,7 +965,7 @@ test_expect_success 'am --message-id -s signs off after the message id' '
965965
git am -s --message-id patch1.eml &&
966966
test_path_is_missing .git/rebase-apply &&
967967
git cat-file commit HEAD | tail -n2 | head -n1 >actual &&
968-
grep Message-Id patch1.eml >expected &&
968+
grep Message-ID patch1.eml >expected &&
969969
test_cmp expected actual
970970
'
971971

‎t/t4258/mbox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ From: A U Thor <[email protected]>
22
To: [email protected]
33
Subject: [PATCH v2] sample
44
Date: Mon, 3 Aug 2020 22:40:55 +0700
5-
Message-Id: <[email protected]>
5+
Message-ID: <[email protected]>
66
Content-Type: text/plain; charset="utf-8"
77
Content-Transfer-Encoding: base64
88

‎t/t5100/msg0002

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ message:
33

44
From: Nit Picker <[email protected]>
55
Subject: foo is too old
6-
Message-Id: <[email protected]>
6+
Message-ID: <[email protected]>
77

88
Hopefully this would fix the problem stated there.
99

‎t/t5100/msg0003

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ message:
33

44
From: Nit Picker <[email protected]>
55
Subject: foo is too old
6-
Message-Id: <[email protected]>
6+
Message-ID: <[email protected]>
77

88
Hopefully this would fix the problem stated there.
99

‎t/t5100/msg0012--message-id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ docutils заменён на python-docutils
55
python-docutils. В то время как сам rest2web не нужен.
66

77
Signed-off-by: Dmitriy Blinov <[email protected]>
8-
Message-Id: <[email protected]>
8+
Message-ID: <[email protected]>

‎t/t5100/quoted-cr.mbox

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ From: A U Thor <[email protected]>
33
To: [email protected]
44
Subject: [PATCH v2] sample
55
Date: Mon, 3 Aug 2020 22:40:55 +0700
6-
Message-Id: <[email protected]>
6+
Message-ID: <[email protected]>
77
Content-Type: text/plain; charset="utf-8"
88
Content-Transfer-Encoding: base64
99

@@ -27,7 +27,7 @@ From: A U Thor <[email protected]>
2727
To: [email protected]
2828
Subject: [PATCH v2] sample
2929
Date: Mon, 3 Aug 2020 22:40:55 +0700
30-
Message-Id: <[email protected]>
30+
Message-ID: <[email protected]>
3131
Content-Type: text/plain; charset="utf-8"
3232
Content-Transfer-Encoding: base64
3333

‎t/t5100/sample.mbox

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ message:
3535

3636
From: Nit Picker <[email protected]>
3737
Subject: foo is too old
38-
Message-Id: <[email protected]>
38+
Message-ID: <[email protected]>
3939

4040
Hopefully this would fix the problem stated there.
4141

@@ -78,7 +78,7 @@ message:
7878

7979
From: Nit Picker <[email protected]>
8080
Subject: foo is too old
81-
Message-Id: <[email protected]>
81+
Message-ID: <[email protected]>
8282

8383
Hopefully this would fix the problem stated there.
8484

@@ -508,7 +508,7 @@ From [email protected] Wed Nov 12 17:54:41 2008
508508
From: Dmitriy Blinov <[email protected]>
509509
To: [email protected]
510510
Date: Wed, 12 Nov 2008 17:54:41 +0300
511-
Message-Id: <[email protected]>
511+
Message-ID: <[email protected]>
512512
X-Mailer: git-send-email 1.5.6.5
513513
MIME-Version: 1.0
514514
Content-Type: text/plain;

0 commit comments

Comments
 (0)