kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

--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>
maint
Timo Hirvonen 2006-06-24 20:26:49 +03:00 committed by Junio C Hamano
parent 047fbe906b
commit d7de00f7e0
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
diff.c
View File

@ -1433,6 +1433,19 @@ void diff_setup(struct diff_options *options)


int diff_setup_done(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 && if ((options->find_copies_harder &&
options->detect_rename != DIFF_DETECT_COPY) || options->detect_rename != DIFF_DETECT_COPY) ||
(0 <= options->rename_limit && !options->detect_rename)) (0 <= options->rename_limit && !options->detect_rename))