X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=39d9126cb9d397df06d41495a3402123fa4ba46b;hb=41ff7a1076e9282535f77ddfb4e23a95354009fd;hp=e17dd90058443ea75321f8c48818bd0094bd76a3;hpb=8082d8d3050e3fdd7b0f13c7a7b3ad68af7f478a;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index e17dd900..39d9126c 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -282,8 +282,8 @@ void diffcore_rename(struct diff_options *options)
 		else if (detect_rename == DIFF_DETECT_COPY)
 			register_rename_src(p->one, 1);
 	}
-	if (rename_dst_nr == 0 ||
-	    (0 <= rename_limit && rename_limit < rename_dst_nr))
+	if (rename_dst_nr == 0 || rename_src_nr == 0 ||
+	    (0 < rename_limit && rename_limit < rename_dst_nr))
 		goto cleanup; /* nothing to do */
 
 	/* We really want to cull the candidates list early
@@ -307,6 +307,9 @@ void diffcore_rename(struct diff_options *options)
 	if (rename_count == rename_dst_nr)
 		goto cleanup;
 
+	if (minimum_score == MAX_SCORE)
+		goto cleanup;
+
 	num_create = (rename_dst_nr - rename_count);
 	num_src = rename_src_nr;
 	mx = xmalloc(sizeof(*mx) * num_create * num_src);