Thread (118 messages) 118 messages, 6 authors, 1d ago

Re: [PATCH v6 00/10] commit-reach: terminate merge-base walk when one side is exhausted

From: Kristofer Karlsson <hidden>
Date: 2026-07-11 21:48:34

On Sat, 11 Jul 2026 at 22:58, Junio C Hamano [off-list ref] wrote:
As always, do *not* base your patches on 'next'.  I cannot apply
such a patch series to my tree, as merging the resulting topic down
to 'master' will pull _all_ the other topics, including those that
are not ready, plus commits that merge these topics into 'next',
into 'master'.

Instead, choose the topics that you do depend on, prepare a merge of
these branches into a stable base (like v2.55.0 or master), and then
build your series on top.
Ah I think I phrased it poorly in the cover letter.
When I said that it's based on next, I meant that it is
verified to work against next but I also confirmed it
works against what you suggested earlier, e.g. a synthetic base:

    git checkout -b synthetic-base origin/master
    git merge --no-ff kk/commit-reach-find-all-fix

There is one textual conflict in commit-reach.c;
the resolution combines both:

    if (!min_generation && !corrected_commit_dates_enabled(r)) {
        queue.pq.compare = compare_commits_by_commit_date;
        gen_ordered = 0;
    }

After that, all ten patches apply cleanly with git am -3.

I should have stated this more clearly in the cover letter
instead of mentioning next at all.

Thanks,
Kristofer
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help