kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Brandon Williams 2017-05-30 10:31:05 -07:00 committed by Junio C Hamano
parent 315f49f20b
commit 128be8767d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tree-diff.c
View File

@ -577,7 +577,9 @@ static inline int diff_might_be_rename(void)
!DIFF_FILE_VALID(diff_queued_diff.queue[0]->one); !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_options diff_opts;
struct diff_queue_struct *q = &diff_queued_diff; 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.break_opt = opt->break_opt;
diff_opts.rename_score = opt->rename_score; diff_opts.rename_score = opt->rename_score;
diff_setup_done(&diff_opts); 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); diffcore_std(&diff_opts);
clear_pathspec(&diff_opts.pathspec); 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); 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()) 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); strbuf_release(&base);