summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 10:30:55 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-02 09:36:07 +0900
commitb9acf54dbd2906249abb2a406d466b47da44678e (patch)
tree72bdfd4a15a8437bd7ce55e1a379369449f6f9db /diff.h
parentbd25f288767aa26f42ac02d2d36695c8df9134dd (diff)
downloadgit-b9acf54dbd2906249abb2a406d466b47da44678e.tar.gz
combine-diff: convert diff_tree_combined to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 150f1c5a1c..6aeeda035e 100644
--- a/diff.h
+++ b/diff.h
@@ -236,7 +236,7 @@ struct combine_diff_path {
extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
int dense, struct rev_info *);
-extern void diff_tree_combined(const unsigned char *sha1, const struct oid_array *parents, int dense, struct rev_info *rev);
+extern void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);