X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=39d9126cb9d397df06d41495a3402123fa4ba46b;hb=a3f583cbf7929f290a47dc0a952ee6b0faa9d279;hp=6a9d95d0593f26c5e698c5e593a9efc287c8e399;hpb=3299c6f6a8a384453d025ffa117c5d8b35ba1972;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 6a9d95d0..39d9126c 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -282,7 +282,7 @@ 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 ||
+	if (rename_dst_nr == 0 || rename_src_nr == 0 ||
 	    (0 < rename_limit && rename_limit < rename_dst_nr))
 		goto cleanup; /* nothing to do */
 
@@ -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);