From ee542ee3fc309fa95622b274c09eefbe394cd108 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 1 Mar 2008 01:14:31 -0500 Subject: [PATCH] rename: warn user when we have turned off rename detection Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diffcore-rename.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diffcore-rename.c b/diffcore-rename.c index 3d377251be..31941bcbbf 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++) { -- 2.11.4.GIT