From: Junio C Hamano <junkio@cox.net>
Date: Wed, 9 Aug 2006 20:17:19 +0000 (-0700)
Subject: make --find-copies-harder imply -C
X-Git-Tag: v1.4.2-rc4~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=03b9d560bed6029f43968ad3f09a8f9c015b20e0;p=git.git

make --find-copies-harder imply -C

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

diff --git a/diff.c b/diff.c
index 895c13765..02a409d96 100644
--- a/diff.c
+++ b/diff.c
@@ -1515,9 +1515,10 @@ void diff_setup(struct diff_options *options)
 
 int diff_setup_done(struct diff_options *options)
 {
-	if ((options->find_copies_harder &&
-	     options->detect_rename != DIFF_DETECT_COPY) ||
-	    (0 <= options->rename_limit && !options->detect_rename))
+	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 |