On Wed, Aug 06, 2025 at 02:18:34PM -0700, Junio C Hamano wrote: > SZEDER Gábor <szeder.dev@xxxxxxxxx> writes: > > > Before merging please make sure that the topic can be built on its > > own. Currently all of its commits, including the merge commit the > > topic is based on, fail to build because: > > > > $ git log --oneline -1 > > fc33fe7eff (HEAD) Merge branch 'ps/reflog-migrate-fixes' into ps/remote-rename-fix > > $ make > > CC builtin/reflog.o > > builtin/reflog.c:7:10: fatal error: object-store.h: No such file or directory > > 7 | #include "object-store.h" > > | ^~~~~~~~~~~~~~~~ > > compilation terminated. > > make: *** [Makefile:2817: builtin/reflog.o] Error 1 > > The joy of having too many moving parts X-<. > > Thanks for catching. I guess what I learned is that I'll refrain from building on top of a topic that hasn't hit "next" yet from now on. I knew it was a going to become a bit painful, but I guess it's even more so than I expected. The merge commit does need to rename the include from "object-store.h" to "odb.h", which is because the parent topic was built on top of "maint" where the rename hasn't yet happened. Thanks! Patrick
