summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-09 20:17:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-09 20:17:19 (GMT)
commit03b9d560bed6029f43968ad3f09a8f9c015b20e0 (patch)
tree5eca1497169be397c6dac40e6aae5894d5897da5
parent02c5cba2007856465710aa37cd41b404372ab95b (diff)
downloadgit-03b9d560bed6029f43968ad3f09a8f9c015b20e0.zip
git-03b9d560bed6029f43968ad3f09a8f9c015b20e0.tar.gz
git-03b9d560bed6029f43968ad3f09a8f9c015b20e0.tar.bz2
make --find-copies-harder imply -C
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--diff.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/diff.c b/diff.c
index 895c137..02a409d 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 |