Re: [PATCH v3 1/2] add-patch: introduce 'p' in interactive-patch

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 28, 2024, 14:45 UTC
Message-ID: <xmqqttkqxvnw.fsf@gitster.g>
In-Reply-To: <4fc0e4ba-16c2-48ae-beaa-239568dcd16d@gmail.com>

Rubén Justo <rjusto@gmail.com> writes:

Show 22 quoted lines

> Shortly we're going make interactive-patch stop printing automatically
> the hunk under certain circumstances.
>
> Let's introduce a new option to allow the user to explicitly request
> the printing.
>
> Signed-off-by: Rubén Justo <rjusto@gmail.com>
> ---
>  Documentation/git-add.txt  |  1 +
>  add-patch.c                |  4 ++++
>  t/t3701-add-interactive.sh | 22 +++++++++++-----------
>  3 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
> index 14a371fff3..2965cd0fb6 100644
> --- a/Documentation/git-add.txt
> +++ b/Documentation/git-add.txt
> @@ -348,6 +348,7 @@ patch::
>         K - leave this hunk undecided, see previous hunk
>         s - split the current hunk into smaller hunks
>         e - manually edit the current hunk
> +       p - print the current hunk again

With the hint of "stop printing under certian circumstances" in the proposed log message, this makes us anticipate that "again" will be dropped dynamically when we did skip, and after we printed, "again" will be kept.

But such a dynamic rewording would be more appropriate for the interactive command prompt (which is already dynamic). Perhaps dropping "again" from this static text would be better.

Let's see what happens in [2/2]. Perhaps we have already code to dynamically update the help text, in which case the above does not apply.