Merge branch 'js/reset'

diff --git a/tree-diff.c b/tree-diff.c
index 26bdbdd2bfea5eab99b9f1c38936efe56f1ab45a..7c261fd7c3b38d2c2dbd722617c628d98848cbc1 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -319,6 +319,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co
        diff_opts.detect_rename = DIFF_DETECT_RENAME;
        diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
        diff_opts.single_follow = opt->paths[0];
+       diff_opts.break_opt = opt->break_opt;
        paths[0] = NULL;
        diff_tree_setup_paths(paths, &diff_opts);
        if (diff_setup_done(&diff_opts) < 0)