Subject: [PATCH v2] doc: diff-options.adoc: make *.noprefix split translatable

From: [email-masked]
Date: Sun, 1 Mar 2026 20:21:14 +0100

From: Kristoffer Haugsbakk <[email-masked]>

We cannot split single words like what we did in the previous
commit. That is because the doc translations are processed in
bigger chunks.

Instead write the two paragraphs with the only variations being this
configuration variable.

Reported-by: Jean-Noël Avila <[email-masked]>
Signed-off-by: Kristoffer Haugsbakk <[email-masked]>
---

Notes (series):
    Notes to the maintainer: based on topic kh/format-patch-noprefix-is-boolean
    to fix the issue reported in <[email-masked]>
    
    v2:
    • fix `endif`
    • Don’t use `TRANSLATORS` callout

 Documentation/diff-options.adoc | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
index 8f632d5fe1a..fcfcdf0286e 100644
--- a/Documentation/diff-options.adoc
+++ b/Documentation/diff-options.adoc
@@ -859,12 +859,18 @@ endif::git-format-patch[]
 	Do not show any source or destination prefix.
 
 `--default-prefix`::
+ifdef::git-format-patch[]
 	Use the default source and destination prefixes ("a/" and "b/").
-	This overrides configuration variables such as
-ifndef::git-format-patch[`diff.noprefix`,]
-ifdef::git-format-patch[`format.noprefix`,]
+	This overrides configuration variables such as `format.noprefix`,
 	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
 	(see linkgit:git-config[1]).
+endif::git-format-patch[]
+ifndef::git-format-patch[]
+	Use the default source and destination prefixes ("a/" and "b/").
+	This overrides configuration variables such as `diff.noprefix`,
+	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
+	(see linkgit:git-config[1]).
+endif::git-format-patch[]
 
 `--line-prefix=<prefix>`::
 	Prepend an additional _<prefix>_ to every line of output.

Interdiff against v1:
  diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
  index e4d02cc93a9..fcfcdf0286e 100644
  --- a/Documentation/diff-options.adoc
  +++ b/Documentation/diff-options.adoc
  @@ -859,7 +859,6 @@ endif::git-format-patch[]
   	Do not show any source or destination prefix.
   
   `--default-prefix`::
  -// TRANSLATORS: format.noprefix / diff.noprefix
   ifdef::git-format-patch[]
   	Use the default source and destination prefixes ("a/" and "b/").
   	This overrides configuration variables such as `format.noprefix`,
  @@ -871,7 +870,7 @@ ifndef::git-format-patch[]
   	This overrides configuration variables such as `diff.noprefix`,
   	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
   	(see linkgit:git-config[1]).
  -ifndef::git-format-patch[]
  +endif::git-format-patch[]
   
   `--line-prefix=<prefix>`::
   	Prepend an additional _<prefix>_ to every line of output.

Range-diff against v1:
1:  55e56c90959 ! 1:  07acc52c3bc doc: diff-options.adoc: make *.noprefix split translatable
    @@ Commit message
         Instead write the two paragraphs with the only variations being this
         configuration variable.
     
    -    It’s not easy to spot the difference here. So let’s leave a comment
    -    for translators.
    -
         Reported-by: Jean-Noël Avila <[email-masked]>
         Signed-off-by: Kristoffer Haugsbakk <[email-masked]>
     
    +
    + ## Notes (series) ##
    +    Notes to the maintainer: based on topic kh/format-patch-noprefix-is-boolean
    +    to fix the issue reported in <[email-masked]>
    +
    +    v2:
    +    • fix `endif`
    +    • Don’t use `TRANSLATORS` callout
    +
      ## Documentation/diff-options.adoc ##
     @@ Documentation/diff-options.adoc: endif::git-format-patch[]
      	Do not show any source or destination prefix.
      
      `--default-prefix`::
    -+// TRANSLATORS: format.noprefix / diff.noprefix
     +ifdef::git-format-patch[]
      	Use the default source and destination prefixes ("a/" and "b/").
     -	This overrides configuration variables such as
    @@ Documentation/diff-options.adoc: endif::git-format-patch[]
     +	This overrides configuration variables such as `diff.noprefix`,
     +	`diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
     +	(see linkgit:git-config[1]).
    -+ifndef::git-format-patch[]
    ++endif::git-format-patch[]
      
      `--line-prefix=<prefix>`::
      	Prepend an additional _<prefix>_ to every line of output.

base-commit: b9b583bd007ca814ebd362bdd6441aac02e9414b
-- 
2.53.0.26.g2afa8602a26