summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-05-15 16:42:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-16 11:42:03 +0900
commitcbd53a2193d11e83b5bad2c3514bd1603074bc36 (patch)
tree6bbac3f93ec8f2368467c22084522163ae635ad7 /builtin/merge-tree.c
parentalloc: allow arbitrary repositories for alloc functions (diff)
downloadtgif-cbd53a2193d11e83b5bad2c3514bd1603074bc36.tar.xz
object-store: move object access functions to object-store.h
This should make these functions easier to find and cache.h less overwhelming to read. In particular, this moves: - read_object_file - oid_object_info - write_object_file As a result, most of the codebase needs to #include object-store.h. In this patch the #include is only added to files that would fail to compile otherwise. It would be better to #include wherever identifiers from the header are used. That can happen later when we have better tooling for it. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r--builtin/merge-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 32736e0b10..1b702d44c9 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -1,6 +1,7 @@
#include "builtin.h"
#include "tree-walk.h"
#include "xdiff-interface.h"
+#include "object-store.h"
#include "blob.h"
#include "exec_cmd.h"
#include "merge-blobs.h"