git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Documentation: mention the amlog in howto/maintain-git.txt

From
KHKristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date
Sep 30, 2024, 21:06 UTC
Message-ID
<ff2909b2-3526-4628-bb11-b3a09066a7a6@app.fastmail.com>
In-Reply-To
<a4b1da93e16d88323181f8f8444f01d96e09ef45.1727729100.git.me@ttaylorr.com>
On Mon, Sep 30, 2024, at 22:45, Taylor Blau wrote:
Show 46 quoted lines
> 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
Nit: `[notes]` is indented with spaces while the next line is indented
with a tab.  I guess it’s supposed to just be spaces in this context?
Show 12 quoted lines
> +
> +   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

It might be worth explicitly mentioning the git-cherry-pick(1) footgun that Junio talked about in his email: you have to restrict yourself to git-rebase(1) and `git commit --amend`. Since git-cherry-pick(1) doesn’t care about (respect?) this configuration.

Right now it’s implied of course (“when rebasing”).
-- 
Kristoffer Haugsbakk
Previous: Taylor BlauNext: Taylor Blau
Message 5 of 18 in “Linking topic merges to mailing list threads”
  1. Emily ShafferSep 30, 2024
  2. Konstantin RyabitsevSep 30, 2024
  3. Junio C HamanoSep 30, 2024
  4. Documentation: mention the amlog in howto/maintain-git.txtTaylor Blau, Sep 30, 2024
  5. Kristoffer HaugsbakkSep 30, 2024
  6. Taylor BlauOct 2, 2024
  7. Junio C HamanoSep 30, 2024
  8. Taylor BlauOct 2, 2024
  9. Documentation: mention the amlog in howto/maintain-git.txtTaylor Blau, Oct 2, 2024
  10. Junio C HamanoOct 2, 2024
  11. Taylor BlauOct 3, 2024
  12. Documentation: mention the amlog in howto/maintain-git.txtTaylor Blau, Oct 3, 2024
  13. Junio C HamanoOct 3, 2024
  14. Ramsay JonesOct 3, 2024
  15. Taylor BlauOct 3, 2024
  16. Kristoffer HaugsbakkSep 30, 2024
  17. Eric WongOct 2, 2024
  18. Jeff KingOct 2, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.