diff options
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index 0f62f54b5e..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, parent->item->object.sha1); + sha1_array_append(&parents, parent->item->object.oid.hash); parent = parent->next; } - diff_tree_combined(commit->object.sha1, &parents, dense, rev); + diff_tree_combined(commit->object.oid.hash, &parents, dense, rev); sha1_array_clear(&parents); } |