From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: "Rubén Justo" <rjusto@gmail.com>,
"Git List" <git@vger.kernel.org>,
"Phillip Wood" <phillip.wood@dunelm.org.uk>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v3] add-patch: edit the hunk again
Date: Tue, 01 Oct 2024 10:58:15 -0700 [thread overview]
Message-ID: <xmqqv7ybyabs.fsf@gitster.g> (raw)
In-Reply-To: <9c7af640-ee3a-4a17-84f6-f56fee7efe37@gmail.com> (Phillip Wood's message of "Tue, 1 Oct 2024 11:03:10 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> 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.
next prev parent reply other threads:[~2024-10-01 17:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-15 11:38 [PATCH] add-patch: edit the hunk again Rubén Justo
2024-09-16 13:33 ` Phillip Wood
2024-09-16 17:35 ` Junio C Hamano
2024-09-16 22:09 ` Rubén Justo
2024-09-18 10:06 ` phillip.wood123
2024-09-18 17:46 ` Rubén Justo
2024-09-18 17:51 ` [PATCH v2] " Rubén Justo
2024-09-23 9:07 ` phillip.wood123
2024-09-23 16:02 ` Junio C Hamano
2024-09-24 22:54 ` Rubén Justo
2024-10-01 10:02 ` Phillip Wood
2024-10-02 16:36 ` Rubén Justo
2024-09-28 14:30 ` [PATCH v3] " Rubén Justo
2024-10-01 10:03 ` Phillip Wood
2024-10-01 17:58 ` Junio C Hamano [this message]
2024-10-02 17:34 ` Rubén Justo
2024-10-02 17:27 ` Rubén Justo
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=xmqqv7ybyabs.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=phillip.wood123@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=rjusto@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).