summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:31:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-05 02:23:58 (GMT)
commit66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch)
tree93238d8cef2a91c8792e591e2752bb1971543581 /log-tree.c
parent9e5e0c289a900186b8943741cc632ea3bb6e1510 (diff)
downloadgit-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.zip
git-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.gz
git-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.bz2
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 'log-tree.c')
-rw-r--r--log-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/log-tree.c b/log-tree.c
index b402425..2903874 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -822,8 +822,8 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
* we merged _in_.
*/
parse_commit_or_die(parents->item);
- diff_tree_sha1(parents->item->tree->object.oid.hash,
- oid->hash, "", &opt->diffopt);
+ diff_tree_oid(&parents->item->tree->object.oid,
+ oid, "", &opt->diffopt);
log_tree_diff_flush(opt);
return !opt->loginfo;
}
@@ -837,8 +837,8 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
struct commit *parent = parents->item;
parse_commit_or_die(parent);
- diff_tree_sha1(parent->tree->object.oid.hash,
- oid->hash, "", &opt->diffopt);
+ diff_tree_oid(&parent->tree->object.oid,
+ oid, "", &opt->diffopt);
log_tree_diff_flush(opt);
showed_log |= !opt->loginfo;