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

Re: [PATCH v4 2/2] commit-reach: early exit paint_down_to_common for single merge-base

From
Kristofer Karlsson <krka@spotify.com>
Date
May 12, 2026, 05:16 UTC
Message-ID
<CAL71e4MiOCx8OP-OjDoS1bPgDs-0yzC4v6tVsg9CLp2K-okQ0Q@mail.gmail.com>
In-Reply-To
<xmqqbjelqx2t.fsf@gitster.g>
Thank you!

As for the difference in variable name, I will attribute it to a mix of oversight and personal preference to keep variable names short if their scope is very small (and longer names for things like fields or larger scope). In fact, I might have preferred flags instead of mb_flags within paint_down_to_common but it conflicted with the existing flags for the commit so I had to differentiate them.

That said, I think it would also be fair to rename it to mb_flags everywhere.
On Tue, 12 May 2026 at 02:40, Junio C Hamano <gitster@pobox.com> wrote:
Show 54 quoted lines
>
> "Kristofer Karlsson via GitGitGadget" <gitgitgadget@gmail.com>
> writes:
>
> > From: Kristofer Karlsson <krka@spotify.com>
> >
> > Commits not in the commit-graph get GENERATION_NUMBER_INFINITY and
> > sort to the top of the priority queue.  After those, commits with
> > finite generation numbers are popped in non-increasing order.
> > When MERGE_BASE_FIND_ALL is not set the first doubly-painted commit
> > with a finite generation is therefore a best merge-base: no commit
> > still in the queue can be a descendant of it.  Skip the expensive
> > STALE drain in this case.
> >
> > Add MERGE_BASE_FIND_ALL to the merge_base_flags enum.  Callers that
> > need every merge-base (repo_get_merge_bases_many, repo_get_merge_bases,
> > repo_in_merge_bases_many, remove_redundant_no_gen) pass the flag to
> > preserve existing behavior.  git merge-base (without --all) passes 0,
> > triggering the early exit.
> >
> > On a 2.2M-commit merge-heavy monorepo with commit-graph:
> >
> >   HEAD vs ~500:   5,229ms -> 24ms
> >   HEAD vs ~1000:  4,214ms -> 39ms
> >   HEAD vs ~5000:  3,799ms -> 46ms
> >   HEAD vs ~10000: 3,827ms -> 61ms
> >
> > Signed-off-by: Kristofer Karlsson <krka@spotify.com>
> > ---
> >  builtin/merge-base.c  |  3 ++-
> >  commit-reach.c        | 19 +++++++++++++++----
> >  commit-reach.h        |  7 ++++++-
> >  t/t6600-test-reach.sh | 40 ++++++++++++++++++++++++++++++++++++++++
> >  4 files changed, 63 insertions(+), 6 deletions(-)
>
> Very nicely done and well described.
>
> > diff --git a/builtin/merge-base.c b/builtin/merge-base.c
> > index 9b50b4660e..a87011c6cd 100644
> > --- a/builtin/merge-base.c
> > +++ b/builtin/merge-base.c
> > @@ -11,11 +11,12 @@
> >
> >  static int show_merge_base(struct commit **rev, size_t rev_nr, int show_all)
> >  {
> > +     enum merge_base_flags flags = show_all ? MERGE_BASE_FIND_ALL : 0;
>
> Curious that only this variable, among 6 that this two-patch series
> introduces for the type, is called "flags" while all others are
> called "mb_flags".  No need to change it; the comment is mostly to
> show I did read the two patches with reasonable attention to the
> detail ;-).
>
> Will queue.  Thanks.
Previous: Junio C Hamano
Message 11 of 11 in “commit-reach: early exit paint_down_to_common for single merge-base”
  1. commit-reach: early exit paint_down_to_common for single merge-baseKristofer Karlsson via GitGitGadget, May 8, 2026
  2. Junio C HamanoMay 11, 2026
  3. commit-reach: early exit paint_down_to_common for single merge-baseKristofer Karlsson via GitGitGadget, May 11, 2026
  4. Patrick SteinhardtMay 11, 2026
  5. commit-reach: early exit paint_down_to_common for single merge-baseKristofer Karlsson via GitGitGadget, May 11, 2026
  6. Patrick SteinhardtMay 11, 2026
  7. 0/2 [RFC] commit-reach: skip STALE drain when only one merge-base neededKristofer Karlsson via GitGitGadget, May 11, 2026
  8. 1/2 commit-reach: introduce merge_base_flags enumKristofer Karlsson via GitGitGadget, May 11, 2026
  9. 2/2 commit-reach: early exit paint_down_to_common for single merge-baseKristofer Karlsson via GitGitGadget, May 11, 2026
  10. Junio C HamanoMay 12, 2026
  11. Kristofer KarlssonMay 12, 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.