From: Elijah Newren Date: Thu, 23 Feb 2023 19:55:41 GMT Subject: Re: [PATCH 12/16] object-store.h: move struct object_info from cache.h Message-ID: In-Reply-To: <1bdd1b4f-ca8e-5790-ef24-7e289692a721@github.com> On Thu, Feb 23, 2023 at 6:20 AM Derrick Stolee wrote: > > On 2/23/2023 3:05 AM, Elijah Newren via GitGitGadget wrote: > > From: Elijah Newren > > > > Move struct object_info, and a few related #define's from cache.h to > > object-store.h. > > > diff --git a/replace-object.h b/replace-object.h > > index 3fbc32eb7b7..3c92ae94610 100644 > > --- a/replace-object.h > > +++ b/replace-object.h > > @@ -1,6 +1,7 @@ > > #ifndef REPLACE_OBJECT_H > > #define REPLACE_OBJECT_H > > > > +#include "cache.h" > > #include "oidmap.h" > > #include "repository.h" > > #include "object-store.h" > > This seems like an unlikely side-effect of the changes you're > making. What is the reason we need this? I'll add the following to the commit message: A surprising effect of this change is that replace-object.h, which includes object-store.h, now needs to directly include cache.h since that is where read_replace_refs is declared and that variable is used in one of its inline functions. The next commit will move that declaration and fix that unfortunate new direct inclusion of cache.h.