summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 17:30:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 00:36:30 (GMT)
commit7b8dea0c7570a2028f204498c82c8ca7ec6950e3 (patch)
treec82e22cd716506a480e086aa444dc67897f9cc4e /diff.h
parent09fae19aa8db639d2384a98f8ebd2f9ec66f6e28 (diff)
downloadgit-7b8dea0c7570a2028f204498c82c8ca7ec6950e3.zip
git-7b8dea0c7570a2028f204498c82c8ca7ec6950e3.tar.gz
git-7b8dea0c7570a2028f204498c82c8ca7ec6950e3.tar.bz2
tree-diff: convert diff_root_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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index 6aeeda0..8d46a67 100644
--- a/diff.h
+++ b/diff.h
@@ -215,8 +215,8 @@ extern struct combine_diff_path *diff_tree_paths(
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_root_tree_sha1(const unsigned char *new, 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);
struct combine_diff_path {
struct combine_diff_path *next;