From: Timo Hirvonen <tihirvon@gmail.com>
Date: Sat, 24 Jun 2006 17:26:49 +0000 (+0300)
Subject: --name-only, --name-status, --check and -s are mutually exclusive
X-Git-Tag: v1.4.3-rc1~269^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d7de00f7e0d2374cb7933d2ee1ebe5273a8acf53;p=git.git

--name-only, --name-status, --check and -s are mutually exclusive

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/diff.c b/diff.c
index 1c131ff4d..5358fd0c1 100644
--- a/diff.c
+++ b/diff.c
@@ -1433,6 +1433,19 @@ void diff_setup(struct diff_options *options)
 
 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))