make --find-copies-harder imply -C

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

diff --git a/diff.c b/diff.c
index 895c1376559cc2aaa1e6c25361a9a6b831c9a18a..02a409d9647f1093310a7ab3325fad5c2c3951ad 100644 (file)
--- 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 |