summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 10:31:03 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-05 11:23:58 +0900
commit66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch)
tree93238d8cef2a91c8792e591e2752bb1971543581 /combine-diff.c
parent9e5e0c289a900186b8943741cc632ea3bb6e1510 (diff)
downloadgit-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.gz
diff-tree: convert diff_tree_sha1 to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 c823645106..04c4ae8564 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1336,7 +1336,7 @@ static struct combine_diff_path *find_paths_generic(const struct object_id *oid,
opt->output_format = stat_opt;
else
opt->output_format = DIFF_FORMAT_NO_OUTPUT;
- diff_tree_sha1(parents->oid[i].hash, oid->hash, "", opt);
+ diff_tree_oid(&parents->oid[i], oid, "", opt);
diffcore_std(opt);
paths = intersect_paths(paths, i, num_parent);
@@ -1463,7 +1463,7 @@ void diff_tree_combined(const struct object_id *oid,
if (stat_opt) {
diffopts.output_format = stat_opt;
- diff_tree_sha1(parents->oid[0].hash, oid->hash, "", &diffopts);
+ diff_tree_oid(&parents->oid[0], oid, "", &diffopts);
diffcore_std(&diffopts);
if (opt->orderfile)
diffcore_order(opt->orderfile);