diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-29 10:24:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 10:43:28 -0700 |
| commit | b16b60f71b2354cbad5f2dc16bd5f6cf7d617579 (patch) | |
| tree | 8afa4e7dd5c9277fb6a28f9b5e8813ff7aa069fb /archive-zip.c | |
| parent | Second batch for 2.19 cycle (diff) | |
| parent | commit: allow lookup_commit_graft to handle arbitrary repositories (diff) | |
| download | tgif-b16b60f71b2354cbad5f2dc16bd5f6cf7d617579.tar.xz | |
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
* sb/object-store-grafts:
commit: allow lookup_commit_graft to handle arbitrary repositories
commit: allow prepare_commit_graft to handle arbitrary repositories
shallow: migrate shallow information into the object parser
path.c: migrate global git_path_* to take a repository argument
cache: convert get_graft_file to handle arbitrary repositories
commit: convert read_graft_file to handle arbitrary repositories
commit: convert register_commit_graft to handle arbitrary repositories
commit: convert commit_graft_pos() to handle arbitrary repositories
shallow: add repository argument to is_repository_shallow
shallow: add repository argument to check_shallow_file_for_update
shallow: add repository argument to register_shallow
shallow: add repository argument to set_alternate_shallow_file
commit: add repository argument to lookup_commit_graft
commit: add repository argument to prepare_commit_graft
commit: add repository argument to read_graft_file
commit: add repository argument to register_commit_graft
commit: add repository argument to commit_graft_pos
object: move grafts to object parser
object-store: move object access functions to object-store.h
Diffstat (limited to 'archive-zip.c')
| -rw-r--r-- | archive-zip.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/archive-zip.c b/archive-zip.c index 74f3fe9103..abc556e5a7 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -6,6 +6,7 @@ #include "archive.h" #include "streaming.h" #include "utf8.h" +#include "object-store.h" #include "userdiff.h" #include "xdiff-interface.h" |