aboutsummaryrefslogtreecommitdiffstats
path: root/bundle.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-04-24 11:37:21 -0700
committerJunio C Hamano <gitster@pobox.com>2025-04-24 11:37:21 -0700
commitd61ff9c237b05f9cff0831d4bde546ed4a9c3c42 (patch)
tree4a787bfa36ba05fbcaefec1334b520a9f175935b /bundle.c
parent4bbb303af69990ccd05fe3a2eb58a1ce036f8220 (diff)
parent68cd492a3e662c75dec364986c81e94716d4ac56 (diff)
downloadgit-d61ff9c237b05f9cff0831d4bde546ed4a9c3c42.tar.gz
Merge branch 'ps/object-file-cleanup' into ps/object-store-cleanup
* ps/object-file-cleanup: object-store: merge "object-store-ll.h" and "object-store.h" object-store: remove global array of cached objects object: split out functions relating to object store subsystem object-file: drop `index_blob_stream()` object-file: split up concerns of `HASH_*` flags object-file: split out functions relating to object store subsystem object-file: move `xmmap()` into "wrapper.c" object-file: move `git_open_cloexec()` to "compat/open.c" object-file: move `safe_create_leading_directories()` into "path.c" object-file: move `mkdir_in_gitdir()` into "path.c"
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundle.c b/bundle.c
index d7ad690843..d661c4ec21 100644
--- a/bundle.c
+++ b/bundle.c
@@ -7,7 +7,7 @@
#include "environment.h"
#include "gettext.h"
#include "hex.h"
-#include "object-store-ll.h"
+#include "object-store.h"
#include "repository.h"
#include "object.h"
#include "commit.h"