From: Timo Hirvonen Date: Sat, 24 Jun 2006 17:26:49 GMT Subject: [PATCH 6/7] --name-only, --name-status, --check and -s are mutually exclusive Message-ID: <20060624202649.b2ed7f57.tihirvon@gmail.com> In-Reply-To: <20060624201843.a5b4f7b9.tihirvon@gmail.com> Signed-off-by: Timo Hirvonen --- diff.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/diff.c b/diff.c index 6be31e7..4b1b4eb 100644 --- a/diff.c +++ b/diff.c @@ -1366,6 +1366,19 @@ void diff_setup(struct diff_options *opt int diff_setup_done(struct diff_options *options) { + int count = 0; + + if (options->output_format & DIFF_FORMAT_NAME) + count++; + if (options->output_format & DIFF_FORMAT_NAME_STATUS) + count++; + if (options->output_format & DIFF_FORMAT_CHECKDIFF) + count++; + if (options->output_format & DIFF_FORMAT_NO_OUTPUT) + count++; + if (count > 1) + die("--name-only, --name-status, --check and -s are mutually exclusive"); + if ((options->find_copies_harder && options->detect_rename != DIFF_DETECT_COPY) || (0 <= options->rename_limit && !options->detect_rename)) -- 1.4.1.rc1.g8637