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

Re: [PATCH] gitglossary: fix indentation of sub-lists

From
KHKristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date
Apr 11, 2026, 20:34 UTC
Message-ID
<fb4dff1b-d304-4f29-a96c-373b1a73989b@app.fastmail.com>
In-Reply-To
<20260411190625.GA754966@coredump.intra.peff.net>
On Sat, Apr 11, 2026, at 21:06, Jeff King wrote:
Show 29 quoted lines
> 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.
`Documentation/doc-diff` confirms that this is the effect of this change.
>
> The same problem appears in several other spots in the glossary.

And that it is the effect for all the other spots at as well: pull a paragraph out of a bullet list back to the previous block (or level).

> We can fix this by using "--" markers, which put the sub-list into its
> own block. This should catch all of the unordered lists in the glossary,
> which I found by grepping for " -" list markers.

Yes, for what it’s worth I think open blocks (`--`) are a great cure for this when you are lucky enough to not already be in an open block.

AsciiDoc is certainly a format.
Show 8 quoted lines
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Just happened to notice this while looking at the "ref" entry.
>
>  Documentation/glossary-content.adoc | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
>[snip]
Previous: Jeff KingNext: Kristoffer Haugsbakk
Message 2 of 7 in “gitglossary: fix indentation of sub-lists”
  1. gitglossary: fix indentation of sub-listsJeff King, Apr 11, 2026
  2. Kristoffer HaugsbakkApr 11, 2026
  3. Kristoffer HaugsbakkApr 11, 2026
  4. Jeff KingApr 11, 2026
  5. gitglossary: fix indentation of sub-listsJeff King, Apr 11, 2026
  6. Kristoffer HaugsbakkApr 12, 2026
  7. Jeff KingApr 12, 2026

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.