From: Kristofer Karlsson Date: Wed, 08 Jul 2026 11:45:54 GMT Subject: Re: What's cooking in git.git (Jul 2026, #03) Message-ID: In-Reply-To: On Tue, 7 Jul 2026 at 19:19, Junio C Hamano wrote: > > * kk/commit-reach-find-all-fix (2026-06-29) 2 commits > - commit-reach: guard !FIND_ALL early exit with generation ordering check > - t6600: add test for merge-base early exit with clock skew > > The early-exit optimization in 'paint_down_to_common()' has been gated > on the queue being generation-ordered, fixing a bug where 'git merge- > base' (without '--all') could return incorrect results on repositories > with v1 commit graphs and clock skew. > > Comments? > cf. > source: [snip] > * kk/merge-base-exhaustion (2026-07-01) 10 commits > . commit-reach: remove commit-date ordering fallback > . commit-reach: move min_generation check into paint_queue_get() > . commit-reach: terminate merge-base walk when one paint side is exhausted > . commit-reach: introduce struct paint_state with per-side counters > . t6600: add clock-skew topologies and step counts for edge cases > . commit-reach: add trace2 instrumentation to paint_down_to_common() > . t6099, t6600: add side-exhaustion regression tests > . t6600: add test cases for side-exhaustion edge cases > . test-lib-functions: improve diagnostic output for trace2 data assertions > . Documentation/technical: add paint-down-to-common doc > > The merge-base computation has been optimized by stopping the walk > early when one side's exclusive commits in the queue are exhausted, > yielding significant speedups for queries with one-sided histories. > > Expecting a reroll. > cf. > source: Small note regarding these two - kk/merge-base-exhaustion is (unfortunately) dependent on kk/commit-reach-find-all-fix before a reroll. I tried building v6 of kk/merge-base-exhaustion on top of kk/commit-reach-find-all-fix but since that one is based on kk/paint-down-to-common-optim it does not include the changes from kk/commit-reach-optim which I also depend on. I thus think the status of kk/merge-base-exhaustion should instead be: "On hold, waiting for kk/commit-reach-find-all-fix to land first." Alternatively you could rebase kk/commit-reach-find-all-fix on master (triggers a small conflict though) and that would also unblock a reroll (but I don't want to generate more work for you). Thanks, Kristofer