summaryrefslogtreecommitdiff
path: root/fsck.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-18 19:20:28 (GMT)
commit00624d608cc69bd62801c93e74d1ea7a7ddd6598 (patch)
treeaa731e8d54303307bff336dceb8216134f25e379 /fsck.c
parent473b8bb3aa01fb214c9905456f1f33c9c7def6b3 (diff)
parentb9dbddf6dace2094061d5093743f29c100cfd534 (diff)
downloadgit-00624d608cc69bd62801c93e74d1ea7a7ddd6598.zip
git-00624d608cc69bd62801c93e74d1ea7a7ddd6598.tar.gz
git-00624d608cc69bd62801c93e74d1ea7a7ddd6598.tar.bz2
Merge branch 'sb/object-store-grafts'
The conversion to pass "the_repository" and then "a_repository" throughout the object access API continues. * 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 'fsck.c')
-rw-r--r--fsck.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fsck.c b/fsck.c
index 0b8b20b..4dfe65f 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "object-store.h"
#include "object.h"
#include "blob.h"
#include "tree.h"
@@ -795,7 +796,7 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
buffer = p + 1;
parent_line_count++;
}
- graft = lookup_commit_graft(&commit->object.oid);
+ graft = lookup_commit_graft(the_repository, &commit->object.oid);
parent_count = commit_list_count(commit->parents);
if (graft) {
if (graft->nr_parent == -1 && !parent_count)