From: Junio C Hamano Date: Fri, 26 Sep 2025 20:54:10 GMT Subject: Re: [PATCH] doc: change the markup of paragraphs following a nested list item Message-ID: In-Reply-To: <20250926194022.19585-1-jn.avila@free.fr> Jean-Noël Avila writes: > Asciidoctor and asciidoc.py have different behaviors when a paragraph > follows a nested list item. Asciidoctor has a bug[1] that makes it add a > straight plus sign (+) at the beginning of the paragraph. > > [1]:https://github.com/asciidoctor/asciidoctor/issues/4704 I read both the above introductory paragraph and the Asciidoctor issue, but couldn't figure out what a "straight plus sign" is. Even if it were a typo of "stray plus sign" (which I am guessing but with very low confidence), I do not see it at https://git.github.io/htmldocs/git-config.html#:~:text=extensions.*,compatObjectFormat which I think is rendered via Asciidoctor. Could you rephrase to clarify? Thanks. > diff --git a/Documentation/config/extensions.adoc b/Documentation/config/extensions.adoc > index 829f2523fc..556eda5d12 100644 > --- a/Documentation/config/extensions.adoc > +++ b/Documentation/config/extensions.adoc > @@ -3,8 +3,7 @@ extensions.*:: > `core.repositoryFormatVersion` is not `1`. See > linkgit:gitrepository-layout[5]. > + > --- > -compatObjectFormat:: > +compatObjectFormat::: > Specify a compatibility hash algorithm to use. The acceptable values > are `sha1` and `sha256`. The value specified must be different from the > value of `extensions.objectFormat`. This allows client level > @@ -19,18 +18,18 @@ Note that the functionality enabled by this extension is incomplete and subject > to change. It currently exists only to allow development and testing of > the underlying feature and is not designed to be enabled by end users. > > -noop:: > +noop::: > This extension does not change git's behavior at all. It is useful only > for testing format-1 compatibility. > + > For historical reasons, this extension is respected regardless of the > `core.repositoryFormatVersion` setting. > > -noop-v1:: > +noop-v1::: > This extension does not change git's behavior at all. It is useful only > for testing format-1 compatibility. > > -objectFormat:: > +objectFormat::: > Specify the hash algorithm to use. The acceptable values are `sha1` and > `sha256`. If not specified, `sha1` is assumed. > + > @@ -38,7 +37,7 @@ Note that this setting should only be set by linkgit:git-init[1] or > linkgit:git-clone[1]. Trying to change it after initialization will not > work and will produce hard-to-diagnose issues. > > -partialClone:: > +partialClone::: > When enabled, indicates that the repo was created with a partial clone > (or later performed a partial fetch) and that the remote may have > omitted sending certain unwanted objects. Such a remote is called a > @@ -50,14 +49,14 @@ The value of this key is the name of the promisor remote. > For historical reasons, this extension is respected regardless of the > `core.repositoryFormatVersion` setting. > > -preciousObjects:: > +preciousObjects::: > If enabled, indicates that objects in the repository MUST NOT be deleted > (e.g., by `git-prune` or `git repack -d`). > + > For historical reasons, this extension is respected regardless of the > `core.repositoryFormatVersion` setting. > > -refStorage:: > +refStorage::: > Specify the ref storage format to use. The acceptable values are: > + > include::../ref-storage-format.adoc[] > @@ -67,13 +66,13 @@ Note that this setting should only be set by linkgit:git-init[1] or > linkgit:git-clone[1]. Trying to change it after initialization will not > work and will produce hard-to-diagnose issues. > > -relativeWorktrees:: > +relativeWorktrees::: > If enabled, indicates at least one worktree has been linked with > relative paths. Automatically set if a worktree has been created or > repaired with either the `--relative-paths` option or with the > `worktree.useRelativePaths` config set to `true`. > > -worktreeConfig:: > +worktreeConfig::: > If enabled, then worktrees will load config settings from the > `$GIT_DIR/config.worktree` file in addition to the > `$GIT_COMMON_DIR/config` file. Note that `$GIT_COMMON_DIR` and > @@ -87,11 +86,12 @@ When enabling this extension, you must be careful to move > certain values from the common config file to the main working tree's > `config.worktree` file, if present: > + > +-- > * `core.worktree` must be moved from `$GIT_COMMON_DIR/config` to > `$GIT_COMMON_DIR/config.worktree`. > * If `core.bare` is true, then it must be moved from `$GIT_COMMON_DIR/config` > to `$GIT_COMMON_DIR/config.worktree`. > - > +-- > + > It may also be beneficial to adjust the locations of `core.sparseCheckout` > and `core.sparseCheckoutCone` depending on your desire for customizable > @@ -104,4 +104,3 @@ details. > + > For historical reasons, this extension is respected regardless of the > `core.repositoryFormatVersion` setting. > --- > diff --git a/Documentation/pretty-formats.adoc b/Documentation/pretty-formats.adoc > index 618ddc4a0c..2121e8e1df 100644 > --- a/Documentation/pretty-formats.adoc > +++ b/Documentation/pretty-formats.adoc > @@ -232,7 +232,7 @@ ref names with custom decorations. The `decorate` string may be followed by a > colon and zero or more comma-separated options. Option values may contain > literal formatting codes. These must be used for commas (`%x2C`) and closing > parentheses (`%x29`), due to their role in the option syntax. > -+ > + > ** `prefix=`: Shown before the list of ref names. Defaults to "{nbsp}++(++". > ** `suffix=`: Shown after the list of ref names. Defaults to "+)+". > ** `separator=`: Shown between ref names. Defaults to "+,+{nbsp}". > @@ -241,10 +241,12 @@ parentheses (`%x29`), due to their role in the option syntax. > ** `tag=`: Shown before tag names. Defaults to "`tag:`{nbsp}". > > + > +-- > For example, to produce decorations with no wrapping > or tag annotations, and spaces as separators: > -+ > + > ++%(decorate:prefix=,suffix=,tag=,separator= )++ > +-- > > ++%(describe++`[: