Re: [PATCH 0/2] commit-reach: fix !FIND_ALL early exit with v1 commit graph
- From
Kristofer Karlsson <krka@spotify.com>
- Date
- Jun 29, 2026, 18:27 UTC
- Message-ID
- <CAL71e4P4GbYYv1LdarAbeodm06q841wj4gdGpn0QYADQjOB5gw@mail.gmail.com>
- In-Reply-To
- <xmqqldbxw81i.fsf@gitster.g>
On Mon, 29 Jun 2026 at 19:50, Junio C Hamano <gitster@pobox.com> wrote:
Show 5 quoted lines
> > Where should this new "gen_ordered" flag go in the world with > kk/merge-base-exhaustion topic merged in? Does it also belong > to the paint_state struct or can it be on-stack independent variable > to the function?
I don't think kk/merge-base-exhaustion is ready to be merged as-is and you are right that these two topics would conflict. I will need to reroll v5 and exactly how/when I do that depends on what we do here.
I wanted to quickly share this small patch as a bugfix since the related code is already merged. I think the bug itself might be a very unlikely edge case but I can't really be sure.
My preference would be to merge this as-is, and then I can rework v5 of kk/merge-base-exhaustion on top of it later - it will add some delay but I don't want to rush it since it's a non-trivial change.
The other option is to drop this topic if the risk is deemed low enough, and then I will rework v5 to either apply a similar gen_ordered flag or eliminate that different ordering entirely - I see that as a good long-term goal that simplifies the code while retaining or improving the performance.
I realize the timing is terrible, I wish I had spotted this a week ago instead of right at the 2.55 finalization period.
Thanks, Kristofer