diff options
| author |  Brandon Williams <bmwill@google.com> | 2017-05-30 10:31:03 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-06-05 11:23:58 +0900 |
| commit | 66f414f885aa6f44ae9e764bdd3e3cd7bd80c5a3 (patch) | |
| tree | 93238d8cef2a91c8792e591e2752bb1971543581 /diff.h | |
| parent | notes-merge: convert write_note_to_worktree to struct object_id (diff) | |
| download | tgif-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 'diff.h')
| -rw-r--r-- | diff.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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); |