From: Junio C Hamano <gitster@pobox.com>
To: "Rubén Justo" <rjusto@gmail.com>
Cc: phillip.wood@dunelm.org.uk, Git List <git@vger.kernel.org>
Subject: Re: [PATCH 2/2] add-patch: render hunks through the pager
Date: Fri, 26 Jul 2024 18:40:49 -0700 [thread overview]
Message-ID: <xmqq1q3ftxwe.fsf@gitster.g> (raw)
In-Reply-To: <xmqq8qxouhjv.fsf@gitster.g> (Junio C. Hamano's message of "Fri, 26 Jul 2024 11:36:20 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> In any case, that is an appropriate thing to say in a commit that
> fixes use of such a construct, but not a commit that uses the right
> constuct from the get-go.
>
> I have to say that the [4/4] in the previous round, i.e., fc87b2f7
> (add-patch: render hunks through the pager, 2024-07-25) in my tree,
> is better than this version.
I do recall that you once had a version where the code violates the
guidelines (and breaks dash) in one patch, and gets fixed in another
patch in the same series. The above material would be a perfect fit
in the proposed log message of the latter step. If we spent so much
effort and digging to figure out exactly how it breaks with which
shell, a separate patch to fix, primarily to document the fix, would
have made sense.
But the latest squashes the two and avoids making the mistake in the
first place, eliminating the need for a documented fix. We generally
prefer to do so to avoid breaking bisection (and the recommendation
to keep the fix separate so that we can document it better was made
as an exception), so squashing them into one is fine. But if we
commit to that approach to pretend that there was no silly mistake,
we should be consistent in pretending that is the case.
next prev parent reply other threads:[~2024-07-27 1:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 0:39 [PATCH v2 0/2] add-p P fixups Rubén Justo
2024-07-23 0:42 ` [PATCH v2 1/2] t3701: avoid one-shot export for shell functions Rubén Justo
2024-07-23 0:42 ` [PATCH v2 2/2] pager: make wait_for_pager a no-op for "cat" Rubén Justo
2024-07-23 0:54 ` [PATCH v2 0/2] add-p P fixups Junio C Hamano
2024-07-23 9:15 ` Phillip Wood
2024-07-23 16:52 ` Junio C Hamano
2024-07-23 22:08 ` Rubén Justo
2024-07-24 15:21 ` phillip.wood123
2024-07-24 16:12 ` Rubén Justo
2024-07-25 9:45 ` Phillip Wood
2024-07-25 12:16 ` Rubén Justo
2024-07-25 13:42 ` [PATCH 0/4] squash fixups in rj/add-p-pager Rubén Justo
2024-07-25 13:44 ` [PATCH 1/4] add-patch: test for 'p' command Rubén Justo
2024-07-25 13:44 ` [PATCH 2/4] pager: do not close fd 2 unnecessarily Rubén Justo
2024-07-25 13:44 ` [PATCH 3/4] pager: introduce wait_for_pager Rubén Justo
2024-07-25 13:44 ` [PATCH 4/4] add-patch: render hunks through the pager Rubén Justo
2024-07-25 15:24 ` [PATCH v2 0/2] add-p P fixups Junio C Hamano
2024-07-25 16:41 ` Re* " Rubén Justo
2024-07-25 16:43 ` [PATCH 1/2] pager: introduce wait_for_pager Rubén Justo
2024-07-25 16:43 ` [PATCH 2/2] add-patch: render hunks through the pager Rubén Justo
2024-07-26 18:36 ` Junio C Hamano
2024-07-27 1:40 ` Junio C Hamano [this message]
2024-07-27 14:33 ` Rubén Justo
2024-07-26 18:24 ` Re* [PATCH v2 0/2] add-p P fixups Junio C Hamano
2024-07-26 19:22 ` Rubén Justo
2024-07-26 19:48 ` Junio C Hamano
2024-07-26 20:16 ` Rubén Justo
2024-07-28 9:11 ` Rubén Justo
2024-07-29 18:45 ` 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=xmqq1q3ftxwe.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--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).