diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-30 10:31:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-05 11:23:58 +0900 |
| commit | 128be8767d9a20de82f032d5a422fa2a0dadb9bb (patch) | |
| tree | f80295a9724556f9e2ff15334870403801c1429f /tree-diff.c | |
| parent | 315f49f20bfbe65cecc2adfe6131588647c57ed4 (diff) | |
| download | git-128be8767d9a20de82f032d5a422fa2a0dadb9bb.tar.gz | |
tree-diff: convert try_to_follow_renames to struct object_id
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-diff.c')
| -rw-r--r-- | tree-diff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tree-diff.c b/tree-diff.c index fc020d76dc..29e3f6144b 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -577,7 +577,9 @@ static inline int diff_might_be_rename(void) !DIFF_FILE_VALID(diff_queued_diff.queue[0]->one); } -static void try_to_follow_renames(const unsigned char *old, const unsigned char *new, struct strbuf *base, struct diff_options *opt) +static void try_to_follow_renames(const struct object_id *old_oid, + const struct object_id *new_oid, + struct strbuf *base, struct diff_options *opt) { struct diff_options diff_opts; struct diff_queue_struct *q = &diff_queued_diff; @@ -615,7 +617,7 @@ static void try_to_follow_renames(const unsigned char *old, const unsigned char diff_opts.break_opt = opt->break_opt; diff_opts.rename_score = opt->rename_score; diff_setup_done(&diff_opts); - ll_diff_tree_sha1(old, new, base, &diff_opts); + ll_diff_tree_sha1(old_oid->hash, new_oid->hash, base, &diff_opts); diffcore_std(&diff_opts); clear_pathspec(&diff_opts.pathspec); @@ -706,7 +708,7 @@ int diff_tree_oid(const struct object_id *old_oid, retval = ll_diff_tree_sha1(old_oid->hash, new_oid->hash, &base, opt); if (!*base_str && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) - try_to_follow_renames(old_oid->hash, new_oid->hash, &base, opt); + try_to_follow_renames(old_oid, new_oid, &base, opt); strbuf_release(&base); |