Re: [PATCH v3 7/8] commit-reach: terminate merge-base walk when one paint side is exhausted
From: Kristofer Karlsson <hidden>
Date: 2026-06-26 14:40:04
On Fri, 26 Jun 2026 at 16:35, Derrick Stolee [off-list ref] wrote:
quoted
- if (min_generation && generation > last_gen) + if (generation > last_gen) BUG("bad generation skip %"PRItime" > %"PRItime" at %s", generation, last_gen, oid_to_hex(&commit->object.oid));You mention in your own reply that this is broken. This also looks like a stray change for this patch, so perhaps your end state is correct despite this patch causing failures. Will inspect soon.
I did not intend it to be a stray change, but rather a natural followup to the idea that we could fold all of the halt conditions into the same place. I am happy to either revert that part for v4 (to keep the change simpler, but not fully unified) or fix it properly - I think it should be easy since this was just human error, not a sign of a fundamentally tricky problem.
quoted
- test_paint_down_steps 45 2 25 3 + test_paint_down_steps 45 1 25 1...> - test_paint_down_steps 81 80 81 81quoted
+ test_paint_down_steps 81 9 57 10These diffs are satisfying.
Agreed! It was nice to introduce the steps counter to the test suite, showing that the patch reached its intended goal which is clearer than just having benchmarks in the messages. Thanks again, Kristofer