git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: What's cooking in git.git (Jul 2026, #03)

From
Kristofer Karlsson <krka@spotify.com>
Date
Jul 8, 2026, 11:45 UTC
Message-ID
<CAL71e4MrQ25WJHp-08bTS2=y-gd36zs9CVYmYGeRv-6iCpdfdQ@mail.gmail.com>
In-Reply-To
<xmqqeche67lr.fsf@gitster.g>
On Tue, 7 Jul 2026 at 19:19, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
>
> * 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. <xmqqa4sdw55v.fsf@gitster.g>
>  source: <pull.2162.git.1782739162.gitgitgadget@gmail.com>
[snip]
Show 19 quoted lines
> * 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. <CAL71e4PgcZDK-gJziJa_yjEqX9TE+PFMwZn0xbjAUzuUDDDBYA@mail.gmail.com>
>  source: <pull.2149.v5.git.1782923832.gitgitgadget@gmail.com>

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

Previous: Junio C HamanoNext: Junio C Hamano
Message 2 of 4 in “What's cooking in git.git (Jul 2026, #03)”
  1. Junio C HamanoJul 7, 2026
  2. Kristofer KarlssonJul 8, 2026
  3. Junio C HamanoJul 8, 2026
  4. Kristofer KarlssonJul 8, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.