diff options
| author | Elijah Newren <newren@gmail.com> | 2023-02-24 03:09:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-24 04:25:29 +0300 |
| commit | 1c02840008b61676373f3703696dc0c07e6eff7d (patch) | |
| tree | c50014dc16af7df4a73852aeb9061491fa610016 /merge-blobs.c | |
| parent | ac48adf488794417b1060b5ed2377a9fd4c33c17 (diff) | |
object-store.h: move struct object_info from cache.h
Move struct object_info, and a few related #define's from cache.h to
object-store.h.
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.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.c')
| -rw-r--r-- | merge-blobs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-blobs.c b/merge-blobs.c index 8138090f81..aedcab8113 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -1,4 +1,4 @@ -#include "cache.h" +#include "git-compat-util.h" #include "run-command.h" #include "xdiff-interface.h" #include "ll-merge.h" |