allow diff.renamelimit to be set regardless of -M/-C
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
03b9d560be
commit
943d5b73e2
3
diff.c
3
diff.c
@ -1518,9 +1518,6 @@ int diff_setup_done(struct diff_options *options)
|
|||||||
if (options->find_copies_harder)
|
if (options->find_copies_harder)
|
||||||
options->detect_rename = DIFF_DETECT_COPY;
|
options->detect_rename = DIFF_DETECT_COPY;
|
||||||
|
|
||||||
if ((0 <= options->rename_limit && !options->detect_rename)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
if (options->output_format & (DIFF_FORMAT_NAME |
|
if (options->output_format & (DIFF_FORMAT_NAME |
|
||||||
DIFF_FORMAT_NAME_STATUS |
|
DIFF_FORMAT_NAME_STATUS |
|
||||||
DIFF_FORMAT_CHECKDIFF |
|
DIFF_FORMAT_CHECKDIFF |
|
||||||
|
Loading…
Reference in New Issue
Block a user