From: Windl, Ulrich <u.windl@ukr.de>
Date: Fri, 31 Oct 2025 10:08:14 GMT
Subject: RE: [EXT] [PATCH v2 1/5] add-patch: improve help for options j, J, k, and K
Message-ID: <697bf0301cd9459195bdd3cc79e517ae@ukr.de>
In-Reply-To: <75b08ed6-4f0f-4ede-b84a-c2f1c3d15734@web.de>

Hi!

Sorry for the delay, but I was on vacation without access to this mailbox.

For the patch
diff --git a/Documentation/git-add.adoc b/Documentation/git-add.adoc
index ad629c46c5..3266ccf105 100644

I don't see an actual improvement, and I'd prefer the previous version of the doc.
Likwise for
diff --git a/add-patch.c b/add-patch.c
index b0389c5d5b..912266a3f8 100644

Kind regards,
Ulrich Windl

> -----Original Message-----
> From: René Scharfe <l.s.r@web.de>
> Sent: Sunday, October 5, 2025 5:55 PM
> To: git@vger.kernel.org
> Cc: Windl, Ulrich <u.windl@ukr.de>; Junio C Hamano <gitster@pobox.com>;
> Phillip Wood <phillip.wood@dunelm.org.uk>
> Subject: [EXT] [PATCH v2 1/5] add-patch: improve help for options j, J, k, and
> K
> 
> Sicherheits-Hinweis: Diese E-Mail wurde von einer Person außerhalb des UKR
> gesendet. Seien Sie vorsichtig vor gefälschten Absendern, wenn Sie auf Links
> klicken, Anhänge öffnen oder weitere Aktionen ausführen, bevor Sie die
> Echtheit überprüft haben.
> 
> The options j, J, k, and K don't affect the status of the current hunk.
> They just go to a different one.  This is true whether the current hunk
> is undecided or not.  Avoid misunderstanding by no longer mentioning
> the current hunk explicitly in their help texts.
> 
> Signed-off-by: René Scharfe <l.s.r@web.de>
> ---
>  Documentation/git-add.adoc | 8 ++++----
>  add-patch.c                | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/Documentation/git-add.adoc b/Documentation/git-add.adoc
> index ad629c46c5..3266ccf105 100644
> --- a/Documentation/git-add.adoc
> +++ b/Documentation/git-add.adoc
> @@ -342,10 +342,10 @@ patch::
>         d - do not stage this hunk or any of the later hunks in the file
>         g - select a hunk to go to
>         / - search for a hunk matching the given regex
> -       j - leave this hunk undecided, see next undecided hunk
> -       J - leave this hunk undecided, see next hunk
> -       k - leave this hunk undecided, see previous undecided hunk
> -       K - leave this hunk undecided, see previous hunk
> +       j - go to the next undecided hunk
> +       J - go to the next hunk
> +       k - go to the previous undecided hunk
> +       K - go to the previous hunk
>         s - split the current hunk into smaller hunks
>         e - manually edit the current hunk
>         p - print the current hunk
> diff --git a/add-patch.c b/add-patch.c
> index b0389c5d5b..912266a3f8 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -1397,10 +1397,10 @@ static size_t display_hunks(struct add_p_state
> *s,
>  }
> 
>  static const char help_patch_remainder[] =
> -N_("j - leave this hunk undecided, see next undecided hunk\n"
> -   "J - leave this hunk undecided, see next hunk\n"
> -   "k - leave this hunk undecided, see previous undecided hunk\n"
> -   "K - leave this hunk undecided, see previous hunk\n"
> +N_("j - go to the next undecided hunk\n"
> +   "J - go to the next hunk\n"
> +   "k - go to the previous undecided hunk\n"
> +   "K - go to the previous hunk\n"
>     "g - select a hunk to go to\n"
>     "/ - search for a hunk matching the given regex\n"
>     "s - split the current hunk into smaller hunks\n"
> --
> 2.51.0