Re: [PATCH v3] add-patch: edit the hunk again

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 1, 2024, 17:58 UTC
Message-ID: <xmqqv7ybyabs.fsf@gitster.g>
In-Reply-To: <9c7af640-ee3a-4a17-84f6-f56fee7efe37@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

Show 12 quoted lines

> I hoped that change would be in edit_hunk_manually() but it isn't.
>
> I'm afraid I still don't think that changing the default is a good
> idea as it is often very difficult to correct a badly edited hunk. Can
> we offer the user a choice of
>
>     (e) edit the original hunk again
>     (f) fix the edited hunk
>     (d) discard the edit
>
> In [1] you say you discarded that idea because the wording was too
> verbose but something along like the above should be succinct enough.

I too disagree with the change of the default, but I would not complain if we offered the feature to re-edit as long as it is clearly marked as a new optional choice.

Phillip, thanks for being firm yet still constructive.