summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-09 21:05:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-09 21:05:23 (GMT)
commit943d5b73e2adf3cd0d3f72c9a06c75681a4ea3ca (patch)
tree3a1cd037c2e38625f4e374c8692a55ceaa2c87d2
parent03b9d560bed6029f43968ad3f09a8f9c015b20e0 (diff)
downloadgit-943d5b73e2adf3cd0d3f72c9a06c75681a4ea3ca.zip
git-943d5b73e2adf3cd0d3f72c9a06c75681a4ea3ca.tar.gz
git-943d5b73e2adf3cd0d3f72c9a06c75681a4ea3ca.tar.bz2
allow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--diff.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 02a409d..b3b1781 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 |