mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

object-store.h: move struct object_info from cache.h

Browse Source 
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>
This commit is contained in:
Elijah Newren
2023-02-24 00:09:32 +00:00
committed by Junio C Hamano
parent ac48adf488
commit 1c02840008
4 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-blobs.c
View File

@ -1,4 +1,4 @@
#include "cache.h"
#include "git-compat-util.h"
#include "run-command.h"
#include "xdiff-interface.h"
#include "ll-merge.h"