mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff --check: minor fixups

Browse Source 
There is no reason --exit-code and --check-diff must be mutually
exclusive, so assign different bits to different results and allow them
to be returned from the command.  Introduce diff_result_code() to factor
out the common code to decide final status code based on diffopt
settings and use it everywhere.

Update tests to match the above fix.

Turning pager off when "diff --check" is used is a regression.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2007-12-13 23:40:27 -08:00
parent 62c64895cf
commit da31b358fb
7 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-diff-tree.c
View File

@ -132,8 +132,6 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
diff_tree_stdin(line);
}
}
if (opt->diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
return DIFF_OPT_TST(&opt->diffopt, CHECK_FAILED) != 0;
return DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)
&& DIFF_OPT_TST(&opt->diffopt, HAS_CHANGES);
return diff_result_code(&opt->diffopt, 0);
}