From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Emily Shaffer <nasamuffin@google.com>,
Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Subject: [PATCH] Documentation: mention the amlog in howto/maintain-git.txt
Date: Mon, 30 Sep 2024 16:45:14 -0400 [thread overview]
Message-ID: <a4b1da93e16d88323181f8f8444f01d96e09ef45.1727729100.git.me@ttaylorr.com> (raw)
In-Reply-To: <xmqqv7yd548i.fsf@gitster.g>
Part of the maintainer's job is to keep up-to-date and publish the
'amlog' which stores a mapping between a patch's 'Message-Id' e-mail
header and the commit generated by applying said patch.
But our Documentation/howto/maintain-git.txt does not mention the amlog,
or the scripts which exist to help the maintainer keep the amlog
up-to-date.
(This bit me during the first integration round I did as interim
maintainer[1] involved a lot of manual clean-up. More recently it has
come up as part of a research effort to better understand a patch's
lifecycle on the list[2].)
Address this gap by briefly documenting the existence and purpose of the
'post-applypatch' hook in maintaining the amlog entries.
[1]: https://lore.kernel.org/git/Y19dnb2M+yObnftj@nand.local/
[2]: https://lore.kernel.org/git/CAJoAoZ=4ARuH3aHGe5yC_Xcnou_c396q_ZienYPY7YnEzZcyEg@mail.gmail.com/
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
Documentation/howto/maintain-git.txt | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index da31332f11..fd1560327c 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -165,6 +165,22 @@ by doing the following:
In practice, almost no patch directly goes to 'master' or
'maint'.
+ The maintainer is expected to update refs/notes/amlog with a
+ mapping between the applied commit and the 'Message-Id'
+ corresponding to the e-mail which carried the patch.
+
+ This mapping is created with the aid of the "post-applypatch" hook
+ found in the 'todo' branch. That hook should be installed before
+ applying patches. It is also helpful to carry forward any relevant
+ amlog entries when rebasing, so the following config may be useful:
+
+ [notes]
+ rewriteref = refs/notes/amlog
+
+ Finally, take care that the amlog entries are pushed out during
+ integration cycles since external tools and contributors (in
+ addition to internal scripts) may rely on them.
+
- Review the last issue of "What's cooking" message, review the
topics ready for merging (topic->master and topic->maint). Use
"Meta/cook -w" script (where Meta/ contains a checkout of the
base-commit: 3857aae53f3633b7de63ad640737c657387ae0c6
--
2.46.2.633.gf09c3c1769.dirty
next prev parent reply other threads:[~2024-09-30 20:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-30 16:21 Linking topic merges to mailing list threads Emily Shaffer
2024-09-30 16:57 ` Konstantin Ryabitsev
2024-09-30 19:30 ` Junio C Hamano
2024-09-30 20:45 ` Taylor Blau [this message]
2024-09-30 21:06 ` [PATCH] Documentation: mention the amlog in howto/maintain-git.txt Kristoffer Haugsbakk
2024-10-02 15:04 ` Taylor Blau
2024-09-30 21:54 ` Junio C Hamano
2024-10-02 15:05 ` Taylor Blau
2024-10-02 15:03 ` [PATCH v2] " Taylor Blau
2024-10-02 19:47 ` Junio C Hamano
2024-10-03 1:09 ` Taylor Blau
2024-10-03 1:09 ` [PATCH v3] " Taylor Blau
2024-10-03 17:23 ` Junio C Hamano
2024-10-03 18:32 ` Ramsay Jones
2024-10-03 18:44 ` Taylor Blau
2024-09-30 20:41 ` Linking topic merges to mailing list threads Kristoffer Haugsbakk
2024-10-02 22:50 ` Eric Wong
2024-10-02 23:34 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4b1da93e16d88323181f8f8444f01d96e09ef45.1727729100.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=konstantin@linuxfoundation.org \
--cc=nasamuffin@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).