Merge branch 'jt/avoid-ls-refs'

diff --git a/tree-diff.c b/tree-diff.c
index 425668e1e0b468d55e87dba69169acd53bba2c31..0e5432461026eff15fe101cf017cd839702e5870 100644 (file)
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -605,7 +605,7 @@ static void try_to_follow_renames(const struct object_id *old_oid,
        choice = q->queue[0];
        q->nr = 0;
 
-       diff_setup(&diff_opts);
+       repo_diff_setup(opt->repo, &diff_opts);
        diff_opts.flags.recursive = 1;
        diff_opts.flags.find_copies_harder = 1;
        diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;