Junio C Hamano <gits...@pobox.com> writes: > Stefan Beller <sbel...@google.com> writes: > >> Thanks for driving this when I was away! >> >> With the fixup patch, both series are >> Reviewed-by: Stefan Beller <sbel...@google.com> > > I think everybody involved agrees that these two you cited above are > already in good shape. Let's have them in 'next' for the remainder > of this cycle and go incremental, and merge them to 'master' soon > after 2.17 final is tagged. > > Thanks all for working well together.
Just FYI, when merging the topic nd/pack-objects-pack-struct to a codebase with these two topics, because the former adds a handful of inline functions that wants to see packed_git but all existing sources have relied on the rule that cache.h is included early and the fact that packed_git was declared in there, the change in sb/object-store to move the structure declaration to object-store.h causes quite a trouble. I plan to resolve this with an evil merge to include object-store.h from pack-objects.h to resolve this with minimum damage to topics in flight.
