X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=tree-diff.c;h=e1e2e6c6ce3c4effffb26e9aed7c6bdd2b00a5ae;hb=44c36d1ccc9a40bfb31910dfd7e18d59fa8be502;hp=aa0a100295c5c48483c6bfbbfc0105b70680becc;hpb=9b433e44964202befd175f1f28687067b8bd058f;p=git.git diff --git a/tree-diff.c b/tree-diff.c index aa0a10029..e1e2e6c6c 100644 --- a/tree-diff.c +++ b/tree-diff.c @@ -326,6 +326,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co die("unable to set up diff options to follow renames"); diff_tree(t1, t2, base, &diff_opts); diffcore_std(&diff_opts); + diff_tree_release_paths(&diff_opts); /* Go through the new set of filepairing, and see if we find a more interesting one */ for (i = 0; i < q->nr; i++) { @@ -342,6 +343,7 @@ static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, co choice = p; /* Update the path we use from now on.. */ + diff_tree_release_paths(opt); opt->paths[0] = xstrdup(p->one->path); diff_tree_setup_paths(opt->paths, opt); break;