diff options
| author | Patrick Steinhardt <ps@pks.im> | 2025-04-15 11:38:23 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-15 08:24:37 -0700 |
| commit | 68cd492a3e662c75dec364986c81e94716d4ac56 (patch) | |
| tree | 0c5cccd9c0abdc8fd62bf67b9e234a36b86828dd /merge-blobs.c | |
| parent | 176a65ef09f8943439b5b21b8a3ec560fa47959f (diff) | |
object-store: merge "object-store-ll.h" and "object-store.h"
The "object-store-ll.h" header has been introduced to keep transitive
header dependendcies and compile times at bay. Now that we have created
a new "object-store.c" file though we can easily move the last remaining
additional bit of "object-store.h", the `odb_path_map`, out of the
header.
Do so. As the "object-store.h" header is now equivalent to its low-level
alternative we drop the latter and inline it into the former.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
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 0ad0390fea..53f36dbc17 100644 --- a/merge-blobs.c +++ b/merge-blobs.c @@ -4,7 +4,7 @@ #include "merge-ll.h" #include "blob.h" #include "merge-blobs.h" -#include "object-store-ll.h" +#include "object-store.h" static int fill_mmfile_blob(mmfile_t *f, struct blob *obj) { |