From 444e423f81087e71d396ba11c6734e66a40206cb Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Sat, 11 Apr 2026 22:15:50 +0200 Subject: [PATCH 1/5] doc: am: revert Message-ID trailer claim MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I claimed in 3c18135b (doc: am: say that --message-id adds a trailer, 2026-02-09) that `git am --message-id` adds a Git trailer. But that isn’t the case; for the case of a commit message with a subject, body, and no trailer block: It just appends the line right after `paragraph`: Message-ID: It does work for two other cases though, namely subject-only and with an existing trailer block. This is at best an inconsistency and arguably a bug, but we’re at the trailing end of the release cycle now. So reverting the doc is safer than making msg-id act as a trailer, for now. Revert this hunk from commit 3c18135b except the only useful change (“Also use inline-verbatim for `Message-ID`”). Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- Documentation/git-am.adoc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/git-am.adoc b/Documentation/git-am.adoc index 403181baa9fb4a..14f83a8920a89f 100644 --- a/Documentation/git-am.adoc +++ b/Documentation/git-am.adoc @@ -84,11 +84,10 @@ OPTIONS -m:: --message-id:: - Pass the `-m` flag to linkgit:git-mailinfo[1], so that the - `Message-ID` header is added as a trailer (see - linkgit:git-interpret-trailers[1]). The `am.messageid` - configuration variable can be used to specify the default - behaviour. + Pass the `-m` flag to linkgit:git-mailinfo[1], + so that the `Message-ID` header is added to the commit message. + The `am.messageid` configuration variable can be used to specify + the default behaviour. --no-message-id:: Do not add the Message-ID header to the commit message. From e6b3f37b753b7691f6a57f45fe9fade2b7496d8d Mon Sep 17 00:00:00 2001 From: Kristoffer Haugsbakk Date: Sat, 11 Apr 2026 22:20:10 +0200 Subject: [PATCH 2/5] doc: am: correct to full --no-message-id Signed-off-by: Kristoffer Haugsbakk Signed-off-by: Junio C Hamano --- Documentation/git-am.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-am.adoc b/Documentation/git-am.adoc index 14f83a8920a89f..ab71ab7490059e 100644 --- a/Documentation/git-am.adoc +++ b/Documentation/git-am.adoc @@ -91,7 +91,7 @@ OPTIONS --no-message-id:: Do not add the Message-ID header to the commit message. - `no-message-id` is useful to override `am.messageid`. + `--no-message-id` is useful to override `am.messageid`. -q:: --quiet:: From 4bdb17e3a8767195cc0540a6336bfd22d4b6445a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Apr 2026 11:24:44 -0700 Subject: [PATCH 3/5] CI: bump actions/checkout from 4 to 5 for rust-analysis job GitHub Actions started complaining about use of Node.js 20 and I was wondering why only one job uses actions/checkout@v4, while everybody else already uses actions/checkout@v5. It turns out that it is caused by a semantic mismerge between e75cd059 (ci: check formatting of our Rust code, 2025-10-15) that added a new use of actions/checkout@v4 that happened very close to another change 63541ed9 (build(deps): bump actions/checkout from 4 to 5, 2025-10-16) that updated all uses of actions/checkout@v4 to use vactions/checkout@v5. Update the leftover and the last use of actions/checkout@v4 to use actions/checkout@v5 to help ourselves to move away from Node.js 20. Signed-off-by: Junio C Hamano --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f2e93f54611b62..8ed268fc09292a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -480,7 +480,7 @@ jobs: group: rust-analysis-${{ github.ref }} cancel-in-progress: ${{ needs.ci-config.outputs.skip_concurrent == 'yes' }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - run: ci/install-dependencies.sh - run: ci/run-rust-checks.sh sparse: From a65cbd87eaebe1bb7f69b41332dd85b72cdea440 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 11 Apr 2026 17:55:18 -0400 Subject: [PATCH 4/5] gitglossary: fix indentation of sub-lists The glossary entry is a list of terms and their definitions, so multi-paragraph definitions need "+" continuation lines to indicate that they are part of a single entry. When an entry contains a sub-list (say, a bulleted list), the final "+" may become ambiguous: is it connecting the next paragraph to the final entry of the sub-list, or to the original list of definition paragraphs? Asciidoc generally connects it to the former, even when we mean the latter, and you end up with the next paragraph indented incorrectly, like this: glob ...defines glob... Two consecutive asterisks ("**") in patterns matched against full pathname may have special meaning: - ...some special meaning of **... - ...another special meaning of **... - Other consecutive asterisks are considered invalid. Glob magic is incompatible with literal magic. That final "Glob magic is incompatible" paragraph is in the wrong spot. It should be at the same level as "Two consecutive asterisks", as it is not part of the final "Other consecutive asterisks" bullet point. The same problem appears in several other spots in the glossary. Usually we'd fix this by using "--" markers, which put the sub-list into its own block. But there's a catch: in some of these spots we are already in an open block, and nesting open blocks is a problem. It seems to work for me using Asciidoc 10.2.1, but Asciidoctor 2.0.26 makes a mess of it (our intent to open a new block seems to close the old one). Fortunately there's a work-around: when using a "+" list-continuation, the number of empty lines above the continuation indicates which level of parent list to continue. So by adding an empty line after our unordered list (before the "+"), we should be able to continue the definition list item. But asciidoc being asciidoc, of course that is not the end of the story. That technique works fine for the "glob" and "attr" lists in this patch, but under the "refs" item it works for only 1 of the 2 lists! I can't figure out why, and this may be an asciidoctor bug. But we can work around it by using "--" open-block markers here, since we're not already in an open block. So using the extra blank line for the first two instances, and "--" markers for the second two, this patch produces identical output from "doc-diff HEAD^ HEAD" for both --asciidoctor and --asciidoc modes. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/glossary-content.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/glossary-content.adoc b/Documentation/glossary-content.adoc index 20ba121314b9a4..8c4e9dd3beede1 100644 --- a/Documentation/glossary-content.adoc +++ b/Documentation/glossary-content.adoc @@ -430,6 +430,7 @@ full pathname may have special meaning: matches "`a/b`", "`a/x/b`", "`a/x/y/b`" and so on. - Other consecutive asterisks are considered invalid. + + Glob magic is incompatible with literal magic. @@ -452,6 +453,7 @@ these forms: - "`!ATTR`" requires that the attribute `ATTR` be unspecified. + + Note that when matching against a tree object, attributes are still obtained from working tree, not from the given tree object. @@ -560,14 +562,17 @@ The ref namespace is hierarchical. Ref names must either start with `refs/` or be located in the root of the hierarchy. For the latter, their name must follow these rules: + +-- - The name consists of only upper-case characters or underscores. - The name ends with "`_HEAD`" or is equal to "`HEAD`". +-- + There are some irregular refs in the root of the hierarchy that do not match these rules. The following list is exhaustive and shall not be extended in the future: + +-- - `AUTO_MERGE` - `BISECT_EXPECTED_REV` @@ -577,6 +582,7 @@ extended in the future: - `NOTES_MERGE_REF` - `MERGE_AUTOSTASH` +-- + Different subhierarchies are used for different purposes. For example, the `refs/heads/` hierarchy is used to represent local branches whereas From 9e8f4e9c04e3efa494e78b710e0c5f6cc77a0a5e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 13 Apr 2026 13:54:45 -0700 Subject: [PATCH 5/5] Hopefully the final tweak before -rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.54.0.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/RelNotes/2.54.0.adoc b/Documentation/RelNotes/2.54.0.adoc index 3fa25e06f2d1d6..2ad73ff4737e7f 100644 --- a/Documentation/RelNotes/2.54.0.adoc +++ b/Documentation/RelNotes/2.54.0.adoc @@ -526,6 +526,12 @@ Fixes since v2.53 conflicts. (merge c0ce43376b ng/add-files-to-cache-wo-rename later to maint). + * Doc mark-up update for entries in the glossary with bulleted lists. + (merge a65cbd87ea jk/doc-markup-sub-list-indentation later to maint). + + * CI dependency updates. + (merge 4bdb17e3a8 jc/ci-github-actions-use-checkout-v5 later to maint). + * Other code cleanup, docfix, build fix, etc. (merge d79fff4a11 jk/remote-tracking-ref-leakfix later to maint). (merge 7a747f972d dd/t5403-modernise later to maint).