From: "Jean-Noël Avila" <jn.avila@free•fr>
To: kristofferhaugsbakk@fastmail•com, git@vger•kernel.org
Cc: Kristoffer Haugsbakk <code@khaugsbakk•name>, Jeff King <peff@peff•net>
Subject: Re: [PATCH v2 2/2] doc: diff-options.adoc: show format.noprefix for format-patch
Date: Fri, 27 Feb 2026 10:57:58 +0100 [thread overview]
Message-ID: <ff86f877-4b75-403d-a5a4-10ab528a9691@free.fr> (raw)
In-Reply-To: <V2_format.noprefix_and_--default-prefix.423@msgid.xyz>
Le 24/02/2026 à 00:30, kristofferhaugsbakk@fastmail•com a écrit :
> From: Kristoffer Haugsbakk <code@khaugsbakk•name>
>
> git-format-patch(1) uses `format.noprefix` and ignores `diff.noprefix`.
>
> The configuration variable `format.prefix` was added as an “escape
> hatch”, and “it’s unlikely that anybody really wants format.
> noprefix=true in the first place.”[1] Based on that there doesn’t
> seem to be a need to widely advertise this configuration variable.
>
> But in any case: the documentation for this option should not claim
> that it overrides a config that is always ignored.
>
> † 1: 8d5213de (format-patch: add format.noprefix option, 2023-03-09)
>
> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk•name>
> ---
>
> Notes (series):
> v2:
> Change commit message. Don’t use “because”: the two quotes are not causally
> linked like that.
>
> v1:
> `--default-prefix` does override `format.noprefix`. See test `format-patch
> --default-prefix overrides format.noprefix`.
>
> Documentation/diff-options.adoc | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/diff-options.adoc b/Documentation/diff-options.adoc
> index 9cdad6f72a0..8f632d5fe1a 100644
> --- a/Documentation/diff-options.adoc
> +++ b/Documentation/diff-options.adoc
> @@ -860,7 +860,9 @@ endif::git-format-patch[]
>
> `--default-prefix`::
> Use the default source and destination prefixes ("a/" and "b/").
> - This overrides configuration variables such as `diff.noprefix`,
> + This overrides configuration variables such as
> +ifndef::git-format-patch[`diff.noprefix`,]
> +ifdef::git-format-patch[`format.noprefix`,]
> `diff.srcPrefix`, `diff.dstPrefix`, and `diff.mnemonicPrefix`
> (see linkgit:git-config[1]).
>
Hello,
This kind of sentence assembly does not fit well with translations. Each
hunk of the sentence is processed separately and it is a difficulty for
translators as they need to understand the surrounding context of a
segment when translating it.
It is safer to just write the whole paragraph, or at least a sentence in
the ifdef/ifndef sections.
Thanks
next prev parent reply other threads:[~2026-02-27 9:58 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-18 20:26 [PATCH 0/2] format-patch: make boolean and mention in diff-options.adoc kristofferhaugsbakk
2026-02-18 20:26 ` [PATCH 1/2] format-patch: make format.noprefix a boolean kristofferhaugsbakk
2026-02-19 18:03 ` Junio C Hamano
2026-02-23 23:25 ` Kristoffer Haugsbakk
2026-02-20 12:28 ` Jeff King
2026-02-18 20:26 ` [PATCH 2/2] doc: diff-options.adoc: show format.noprefix for format-patch kristofferhaugsbakk
2026-02-19 18:10 ` Junio C Hamano
2026-02-23 23:30 ` [PATCH v2 0/2] format-patch: make boolean and mention in diff-options.adoc kristofferhaugsbakk
2026-02-23 23:30 ` [PATCH v2 1/2] format-patch: make format.noprefix a boolean kristofferhaugsbakk
2026-02-23 23:30 ` [PATCH v2 2/2] doc: diff-options.adoc: show format.noprefix for format-patch kristofferhaugsbakk
2026-02-27 9:57 ` Jean-Noël Avila [this message]
2026-02-27 16:51 ` Junio C Hamano
2026-02-28 12:20 ` kristofferhaugsbakk
2026-02-28 14:08 ` Jean-Noël AVILA
2026-03-01 19:21 ` [PATCH v2] doc: diff-options.adoc: make *.noprefix split translatable kristofferhaugsbakk
2026-03-02 16:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ff86f877-4b75-403d-a5a4-10ab528a9691@free.fr \
--to=jn.avila@free$(echo .)fr \
--cc=code@khaugsbakk$(echo .)name \
--cc=git@vger$(echo .)kernel.org \
--cc=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox