| commit | da31b358fb39b32622c14343ffe157a765f3948b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Dec 2007 07:40:27 +0000 (13 23:40 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 14 Dec 2007 07:40:27 +0000 (13 23:40 -0800) | ||
| tree | f995bc40d7685b5d342e9d60a99a4152a55cf2cd | treesnapshot (tar.gz zip) |
| parent | 62c64895cfcf3bbf34969a69fa96a631f7d5b14e | commitdiff |
diff --check: minor fixups
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>
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>