X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tree-diff.c;h=5b68c0864cac22d083228d5966487913df5c6be2;hb=39f75d26e235798681394e46625716c187a4ee3e;hp=1fb3e94614de4973a242b1f039ee7711a74fad9d;hpb=6339f67fedfec454294dc33ebc3dcec6eeb70e02;p=git.git

diff --git a/tree-diff.c b/tree-diff.c
index 1fb3e9461..5b68c0864 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -412,7 +412,7 @@ int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const cha
 	init_tree_desc(&t1, tree1, size1);
 	init_tree_desc(&t2, tree2, size2);
 	retval = diff_tree(&t1, &t2, base, opt);
-	if (DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
+	if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
 		init_tree_desc(&t1, tree1, size1);
 		init_tree_desc(&t2, tree2, size2);
 		try_to_follow_renames(&t1, &t2, base, opt);