From 03b9d560bed6029f43968ad3f09a8f9c015b20e0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 9 Aug 2006 13:17:19 -0700 Subject: make --find-copies-harder imply -C Signed-off-by: Junio C Hamano --- diff.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 895c137655..02a409d964 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 | -- cgit v1.3 From 943d5b73e2adf3cd0d3f72c9a06c75681a4ea3ca Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 9 Aug 2006 14:05:23 -0700 Subject: allow diff.renamelimit to be set regardless of -M/-C Signed-off-by: Junio C Hamano --- diff.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'diff.c') diff --git a/diff.c b/diff.c index 02a409d964..b3b1781a9c 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 | -- cgit v1.3