Better error message when we are unable to lock the index file

diff --git a/diff.c b/diff.c
index 02a409d9647f1093310a7ab3325fad5c2c3951ad..b3b1781a9cac05457e42691970c93b6e1501f68c 100644 (file)
--- 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 |