From: Junio C Hamano <junkio@cox.net>
Date: Wed, 9 Aug 2006 21:05:23 +0000 (-0700)
Subject: allow diff.renamelimit to be set regardless of -M/-C
X-Git-Tag: v1.4.2-rc4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8c7a107d8eeba18ae56befb6142daaba91aa3ecf;p=git.git

allow diff.renamelimit to be set regardless of -M/-C

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index 02a409d96..b3b1781a9 100644
--- a/diff.c
+++ b/diff.c
@@ -1518,9 +1518,6 @@ int diff_setup_done(struct diff_options *options)
 	if (options->find_copies_harder)
 		options->detect_rename = DIFF_DETECT_COPY;
 
-	if ((0 <= options->rename_limit && !options->detect_rename)
-		return -1;
-
 	if (options->output_format & (DIFF_FORMAT_NAME |
 				      DIFF_FORMAT_NAME_STATUS |
 				      DIFF_FORMAT_CHECKDIFF |