X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diffcore-rename.c;h=31941bcbbf457fe02097f8c46d25f1f9fc7c4f9f;hb=d1b28f512c6d2c7d373c746d8876dbf177ddf114;hp=3d377251bef8ea843b7a7fa41f98d611daecbcc1;hpb=8256c6e0107a51b2714f2e068b693025e4ddcae8;p=git.git

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 3d377251b..31941bcbb 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -468,10 +468,11 @@ void diffcore_rename(struct diff_options *options)
 	 */
 	if (rename_limit <= 0 || rename_limit > 32767)
 		rename_limit = 32767;
-	if (num_create > rename_limit && num_src > rename_limit)
-		goto cleanup;
-	if (num_create * num_src > rename_limit * rename_limit)
+	if ((num_create > rename_limit && num_src > rename_limit) ||
+	    (num_create * num_src > rename_limit * rename_limit)) {
+		warning("too many files, skipping inexact rename detection");
 		goto cleanup;
+	}
 
 	mx = xmalloc(sizeof(*mx) * num_create * num_src);
 	for (dst_cnt = i = 0; i < rename_dst_nr; i++) {