@matheusbsbs / matheus-bagliano / commits / 03b9d560be
Fork 0

make --find-copies-harder imply -C

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

Junio C Hamano committed Aug 9, 2006 at 13:17 UTC 03b9d560bed6029f43968ad3f09a8f9c015b20e0
1 file changed +4 -3
diff.c
+4 -3
@@ -1515,9 +1515,10 @@ void diff_setup(struct diff_options *options)
1515
1516 int diff_setup_done(struct diff_options *options)
1517 {
1518 - if ((options->find_copies_harder &&
1519 - options->detect_rename != DIFF_DETECT_COPY) ||
1520 - (0 <= options->rename_limit && !options->detect_rename))
1518 + if (options->find_copies_harder)
1519 + options->detect_rename = DIFF_DETECT_COPY;
1520 +
1521 + if ((0 <= options->rename_limit && !options->detect_rename)
1522 return -1;
1523
1524 if (options->output_format & (DIFF_FORMAT_NAME |