aboutsummaryrefslogtreecommitdiffstats
path: root/diff.h
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 /diff.h
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 'diff.h')
-rw-r--r--diff.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index 8d46a67099..e0b5034603 100644
--- a/diff.h
+++ b/diff.h
@@ -213,8 +213,9 @@ extern struct combine_diff_path *diff_tree_paths(
struct combine_diff_path *p, const unsigned char *sha1,
const unsigned char **parent_sha1, int nparent,
struct strbuf *base, struct diff_options *opt);
-extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
- const char *base, struct diff_options *opt);
+extern int diff_tree_oid(const struct object_id *old_oid,
+ const struct object_id *new_oid,
+ const char *base, struct diff_options *opt);
extern int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
struct diff_options *opt);