Re: [PATCH v2 0/4] odb: eagerly load alternates
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Aug 13, 2026, 08:56 UTC
- Message-ID
- <an2Gsf0LzYRKkQkZ@pks.im>
- In-Reply-To
- <xmqqy0ebxsap.fsf@gitster.g>
On Wed, Aug 12, 2026 at 08:38:38AM -0700, Junio C Hamano wrote:
Show 11 quoted lines
> Patrick Steinhardt <ps@pks.im> writes: > > > The series is built on top of 010afd3166 (The 12th batch, 2026-08-07) > > with ps/odb-make-creation-pluggable at e927cfeb21 (odb: make creation of > > on-disk structures pluggable, 2026-08-07) merged into it. > > It is not a clean merge, though. Please double check the > synthesized base when I push the integration results out later > today. d296c52baa (Merge branch 'ps/odb-make-creation-pluggable' > into ps/odb-eagerly-load-alternates, 2026-08-12) will be the merge, > unless I notice and fix a mismerge in it before I push it out.
Hm. I'm probably missing something, but your merge is a bit curious as you merge the dependency into the feature branch instead of making it the base of it. If I do the following:
# Switch to the master commit.
$ git switch --detach 010afd3166
# Merge the dependnecy.
$ git merge e927cfeb21Then the only merge conflict I get is in "odb/source-files.c". This is a trivial merge conflict though, as it only impacts included headers. And then the rest of this series applies on top of that merge base without any further issues.
Am I missing something?
Thanks!
Patrick