threads / patch / 64114

patchdoc: fast-import: replace literal block with paragraph

Subject: [PATCH] doc: fast-import: replace literal block with paragraph

## tl;dr

3 messages between Sep 8, 2025 and Sep 8, 2025. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

kristofferhaugsbakk@fastmail.com· Sep 8, 2025, 20:28 UTC · lore

From: Kristoffer Haugsbakk <code@khaugsbakk.name>

68061e34702 (fast-import: disallow "feature export-marks" by default, 2019-08-29) added the documentation for this option. The second paragraph is a literal block but it looks like it should just be a regular paragraph.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---

Notes (series):
    > but it looks like it should just be a regular paragraph.
    
    ... unless this is some kind of callout-block style?

 Documentation/git-fast-import.adoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Show changes to Documentation/git-fast-import.adoc +4 −4

diff --git a/Documentation/git-fast-import.adoc b/Documentation/git-fast-import.adoc
index 3144ffcdb68..c3951f5f879 100644
--- a/Documentation/git-fast-import.adoc
+++ b/Documentation/git-fast-import.adoc
@@ -61,10 +61,10 @@ OPTIONS
 	currently impacts only the `export-marks`, `import-marks`, and
 	`import-marks-if-exists` feature commands.
 +
-	Only enable this option if you trust the program generating the
-	fast-import stream! This option is enabled automatically for
-	remote-helpers that use the `import` capability, as they are
-	already trusted to run their own code.
+Only enable this option if you trust the program generating the
+fast-import stream! This option is enabled automatically for
+remote-helpers that use the `import` capability, as they are
+already trusted to run their own code.
 
 Options for Frontends
 ~~~~~~~~~~~~~~~~~~~~~

base-commit: 2462961280690837670d997bde64bd4ebf8ae66d

-- 
2.51.0.16.gcd94ab5bf81

Jeff King· Sep 8, 2025, 21:05 UTC · re: kristofferhaugsbakk@fastmail.com · lore

Re: [PATCH] doc: fast-import: replace literal block with paragraph

On Mon, Sep 08, 2025 at 10:28:45PM +0200, kristofferhaugsbakk@fastmail.com wrote:

>     > but it looks like it should just be a regular paragraph.
>     
>     ... unless this is some kind of callout-block style?

Nope, I think it was just a mistake on my part. IIRC it is a common asciidoc pitfall not to remove indentation when doing a continuation block. Your patch looks like the right fix. Thanks for finding it.

-Peff

kristofferhaugsbakk@fastmail.com· Sep 8, 2025, 21:20 UTC · re: kristofferhaugsbakk@fastmail.com · lore

[PATCH v2] doc: fast-import: replace literal block with paragraph

From: Kristoffer Haugsbakk <code@khaugsbakk.name>

Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---

Notes (series):
    v1:
    
    > but it looks like it should just be a regular paragraph.
    
    ... unless this is some kind of callout-block style?

 Documentation/git-fast-import.adoc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Show changes to Documentation/git-fast-import.adoc +4 −4

diff --git a/Documentation/git-fast-import.adoc b/Documentation/git-fast-import.adoc
index 3144ffcdb68..c3951f5f879 100644
--- a/Documentation/git-fast-import.adoc
+++ b/Documentation/git-fast-import.adoc
@@ -61,10 +61,10 @@ OPTIONS
 	currently impacts only the `export-marks`, `import-marks`, and
 	`import-marks-if-exists` feature commands.
 +
-	Only enable this option if you trust the program generating the
-	fast-import stream! This option is enabled automatically for
-	remote-helpers that use the `import` capability, as they are
-	already trusted to run their own code.
+Only enable this option if you trust the program generating the
+fast-import stream! This option is enabled automatically for
+remote-helpers that use the `import` capability, as they are
+already trusted to run their own code.
 
 Options for Frontends
 ~~~~~~~~~~~~~~~~~~~~~

Range-diff against v1:
1:  09aaad69689 ! 1:  724b975078d doc: fast-import: replace literal block with paragraph
    @@ Commit message
         paragraph is a literal block but it looks like it should just be
         a regular paragraph.
     
    +    Acked-by: Jeff King <peff@peff.net>
         Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
     
     
      ## Notes (series) ##
    +    v1:
    +
         > but it looks like it should just be a regular paragraph.
     
         ... unless this is some kind of callout-block style?

base-commit: 2462961280690837670d997bde64bd4ebf8ae66d

-- 
2.51.0.16.gcd94ab5bf81