summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-05-30 10:31:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-05 11:23:58 +0900
commit66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch)
tree93238d8cef2a91c8792e591e2752bb1971543581 /builtin/log.c
parentnotes-merge: convert write_note_to_worktree to struct object_id (diff)
downloadtgif-66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3.tar.xz
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 'builtin/log.c')
-rw-r--r--builtin/log.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 6bdba34446..4ef522ee50 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -1043,9 +1043,9 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
diff_setup_done(&opts);
- diff_tree_sha1(origin->tree->object.oid.hash,
- head->tree->object.oid.hash,
- "", &opts);
+ diff_tree_oid(&origin->tree->object.oid,
+ &head->tree->object.oid,
+ "", &opts);
diffcore_std(&opts);
diff_flush(&opts);