Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c
index e7e3411d02..55713049a4 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1540,9 +1540,9 @@ void diff_tree_combined_merge(const struct commit *commit, int dense,
struct sha1_array parents = SHA1_ARRAY_INIT;
while (parent) {
- sha1_array_append(&parents, get_object_hash(parent->item->object));
+ sha1_array_append(&parents, parent->item->object.oid.hash);
parent = parent->next;
}
- diff_tree_combined(get_object_hash(commit->object), &parents, dense, rev);
+ diff_tree_combined(commit->object.oid.hash, &parents, dense, rev);
sha1_array_clear(&parents);
}