diff options
| author | Stefan Beller <sbeller@google.com> | 2018-05-16 01:42:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-16 04:42:03 +0200 |
| commit | cbd53a2193d11e83b5bad2c3514bd1603074bc36 (patch) | |
| tree | 6bbac3f93ec8f2368467c22084522163ae635ad7 /merge-recursive.c | |
| parent | alloc: allow arbitrary repositories for alloc functions (diff) | |
| download | git-cbd53a2193d11e83b5bad2c3514bd1603074bc36.tar.xz git-cbd53a2193d11e83b5bad2c3514bd1603074bc36.zip | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index cbded673c2..455f59d21a 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -8,6 +8,7 @@ #include "advice.h" #include "lockfile.h" #include "cache-tree.h" +#include "object-store.h" #include "commit.h" #include "blob.h" #include "builtin.h" |