summaryrefslogtreecommitdiff
path: root/shallow.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2017-07-12 17:44:14 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-13 12:02:40 -0700
commit8b65a34c4a12cdaae7f43f65f760da0f48ad67e3 (patch)
tree1afb7e225af08f8196b05cfc8ed23c901c33f472 /shallow.c
parent80145b1e412719c960036c8c62a9e35dd23a5b2d (diff)
downloadgit-8b65a34c4a12cdaae7f43f65f760da0f48ad67e3.tar.gz
commit: convert lookup_commit_graft to struct object_id
With this patch, commit.h doesn't contain the string 'sha1' any more. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shallow.c')
-rw-r--r--shallow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/shallow.c b/shallow.c
index 54359d5490..f5591e56da 100644
--- a/shallow.c
+++ b/shallow.c
@@ -107,7 +107,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
cur_depth++;
if ((depth != INFINITE_DEPTH && cur_depth >= depth) ||
(is_repository_shallow() && !commit->parents &&
- (graft = lookup_commit_graft(commit->object.oid.hash)) != NULL &&
+ (graft = lookup_commit_graft(&commit->object.oid)) != NULL &&
graft->nr_parent < 0)) {
commit_list_insert(commit, &result);
commit->object.flags |= shallow_flag;
@@ -398,7 +398,7 @@ void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa)
for (i = 0; i < sa->nr; i++) {
if (has_object_file(sa->oid + i)) {
struct commit_graft *graft;
- graft = lookup_commit_graft(sa->oid[i].hash);
+ graft = lookup_commit_graft(&sa->oid[i]);
if (graft && graft->nr_parent < 0)
continue;
info->ours[info->nr_ours++] = i;