diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-08-09 13:17:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-09 13:17:19 -0700 |
| commit | 03b9d560bed6029f43968ad3f09a8f9c015b20e0 (patch) | |
| tree | 5eca1497169be397c6dac40e6aae5894d5897da5 | |
| parent | find_unique_abbrev() with len=0 should not abbreviate (diff) | |
| download | tgif-03b9d560bed6029f43968ad3f09a8f9c015b20e0.tar.xz | |
make --find-copies-harder imply -C
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | diff.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 | |