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

* jk/follow-rename-score:
use custom rename score during --follow

diff --git a/tree-diff.c b/tree-diff.c
index 7a51d091b5a6babed91f60b9ff7079308afa4e6f..28ad6db9ffa854c3ef9185ba85108e95edc44d51 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -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.single_follow = opt->pathspec.raw[0];
        diff_opts.break_opt = opt->break_opt;
+       diff_opts.rename_score = opt->rename_score;
        paths[0] = NULL;
        diff_tree_setup_paths(paths, &diff_opts);
        if (diff_setup_done(&diff_opts) < 0)