undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/follow-rename-score' into maint

Browse Source 
* jk/follow-rename-score:
  use custom rename score during --follow
This commit is contained in:
Junio C Hamano 2011-12-28 11:49:37 -08:00
commit 0d57085943
1 changed files with 1 additions and 0 deletions

1
tree-diff.c
View File

@ -209,6 +209,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT; diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_opts.single_follow = opt->pathspec.raw[0]; diff_opts.single_follow = opt->pathspec.raw[0];
diff_opts.break_opt = opt->break_opt; diff_opts.break_opt = opt->break_opt;
diff_opts.rename_score = opt->rename_score;
paths[0] = NULL; paths[0] = NULL;
diff_tree_setup_paths(paths, &diff_opts); diff_tree_setup_paths(paths, &diff_opts);
if (diff_setup_done(&diff_opts) < 0) if (diff_setup_done(&diff_opts) < 0)