diff --follow: do not waste cycles while recursing
The "--follow" logic is called from diff_tree_sha1() function, but the input trees to diff_tree_sha1() are not necessarily the top-level trees (compare_tree_entry() calls it while it recursively descends into subtrees). When a newly created path lives in somewhere deep in the source hierarchy, e.g. "platform/", but the rename source is in a totally different place in the destination hierarchy, e.g. "lang-api/src/com/...", running "try_to_find_renames()" while base is set to "platform/" is a wasted call. We only need to run the rename following at the very top level. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Junio C Hamano committed
Aug 13, 2010 at 10:36 UTC
39f75d26e235798681394e46625716c187a4ee3e
1 file changed
+1
-1
tree-diff.c
+1
-1
@@ -412,7 +412,7 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
412
init_tree_desc(&t1, tree1, size1);
413
init_tree_desc(&t2, tree2, size2);
414
retval = diff_tree(&t1, &t2, base, opt);
415
- if (DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
415
+ if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
416
init_tree_desc(&t1, tree1, size1);
417
init_tree_desc(&t2, tree2, size2);
418
try_to_follow_renames(&t1, &t2, base, opt);