diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-30 10:31:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 11:23:58 +0900 |
| commit | fda94b416ed07988e645cec22bf61742d4dd5c95 (patch) | |
| tree | 02acb45c15f15a5092f286e2001f0791b653a9b7 /diff.h | |
| parent | 128be8767d9a20de82f032d5a422fa2a0dadb9bb (diff) | |
| download | git-fda94b416ed07988e645cec22bf61742d4dd5c95.tar.gz | |
tree-diff: convert diff_tree_paths 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.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -210,8 +210,8 @@ const char *diff_line_prefix(struct diff_options *); extern const char mime_boundary_leader[]; 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 combine_diff_path *p, const struct object_id *oid, + const struct object_id **parents_oid, int nparent, struct strbuf *base, struct diff_options *opt); extern int diff_tree_oid(const struct object_id *old_oid, const struct object_id *new_oid, |