From: Derrick Stolee <stolee@gmail•com>
To: "Junio C Hamano" <gitster@pobox•com>,
"SZEDER Gábor" <szeder.dev@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 4/4] line-log: simplify condition checking for merge commits
Date: Mon, 25 Aug 2025 17:43:10 -0400 [thread overview]
Message-ID: <f98f3db4-cd36-4a24-903f-7aebf6af3d51@gmail.com> (raw)
In-Reply-To: <xmqq4itvp19r.fsf@gitster.g>
On 8/25/2025 4:57 PM, Junio C Hamano wrote:
> SZEDER Gábor <szeder.dev@gmail•com> writes:
>
>> In process_ranges_arbitrary_commit() the condition deciding whether
>> the given commit is not a merge, i.e. that it doesn't have more than
>> one parent, is head-scratchingly backwards, flip it.
>
> Hmph, the condition is about "is it a root commit? or is it a
> single-parent commit?", which does not sound overly complicated to
> me.
It is something that one can interpret carefully by thinking about
it, but the negation and OR condition made me need to pause and
think about it, while the positive of "does it have a parent and
a second parent?" was something that flowed naturally when I read
it.
Definitely a taste thing, so I could see you wanting to skip this
one on a pure "don't touch what's not broken" policy.
Thanks,
-Stolee
next prev parent reply other threads:[~2025-08-25 21:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-24 19:06 [PATCH 0/4] line-log: optimize merge commit processing SZEDER Gábor
2025-08-24 19:06 ` [PATCH 1/4] line-log: avoid unnecessary tree diffs when processing merge commits SZEDER Gábor
2025-08-25 14:13 ` Derrick Stolee
2025-08-25 15:35 ` Junio C Hamano
2025-08-28 20:27 ` SZEDER Gábor
2025-08-24 19:06 ` [PATCH 2/4] line-log: get rid of the parents array in process_ranges_merge_commit() SZEDER Gábor
2025-08-24 19:06 ` [PATCH 3/4] line-log: initialize diff queue in process_ranges_ordinary_commit() SZEDER Gábor
2025-08-24 19:06 ` [PATCH 4/4] line-log: simplify condition checking for merge commits SZEDER Gábor
2025-08-25 20:57 ` Junio C Hamano
2025-08-25 21:43 ` Derrick Stolee [this message]
2025-08-25 21:57 ` Junio C Hamano
2025-08-25 14:16 ` [PATCH 0/4] line-log: optimize merge commit processing Derrick Stolee
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=f98f3db4-cd36-4a24-903f-7aebf6af3d51@gmail.com \
--to=stolee@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=szeder.dev@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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