aboutsummaryrefslogtreecommitdiffstats
path: root/merge-ort.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2025-04-15 11:38:18 +0200
committerJunio C Hamano <gitster@pobox.com>2025-04-15 08:24:36 -0700
commitd9f517d051d1008178cb6c809b5f906d0905508f (patch)
treeb830a64b23f00fbfde86c651bf492a773023147a /merge-ort.c
parentobject-file: move `xmmap()` into "wrapper.c" (diff)
downloadgit-d9f517d051d1008178cb6c809b5f906d0905508f.tar.gz
git-d9f517d051d1008178cb6c809b5f906d0905508f.zip
object-file: split out functions relating to object store subsystem
While we have the "object-store.h" header, most of the functionality for object stores is actually hosted in "object-file.c". This makes it hard to find relevant functions and causes us to mix up concerns. Split out functions relating to the object store subsystem into a new "object-store.c" file. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
-rw-r--r--merge-ort.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-ort.c b/merge-ort.c
index 1554900d98..5de3e2fc15 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -36,8 +36,9 @@
#include "merge-ll.h"
#include "match-trees.h"
#include "mem-pool.h"
+#include "object-file.h"
#include "object-name.h"
-#include "object-store-ll.h"
+#include "object-store.h"
#include "oid-array.h"
#include "path.h"
#include "promisor-remote.h"