diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-13 23:40:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-13 23:40:27 -0800 |
| commit | da31b358fb39b32622c14343ffe157a765f3948b (patch) | |
| tree | f995bc40d7685b5d342e9d60a99a4152a55cf2cd /t/t4015-diff-whitespace.sh | |
| parent | 62c64895cfcf3bbf34969a69fa96a631f7d5b14e (diff) | |
| download | git-da31b358fb39b32622c14343ffe157a765f3948b.tar.gz git-da31b358fb39b32622c14343ffe157a765f3948b.tar.xz | |
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>
Diffstat (limited to 't/t4015-diff-whitespace.sh')
| -rwxr-xr-x | t/t4015-diff-whitespace.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh index dc538b3e3..757a27abd 100755 --- a/t/t4015-diff-whitespace.sh +++ b/t/t4015-diff-whitespace.sh @@ -148,14 +148,14 @@ test_expect_failure 'check with space before tab in indent' ' ' -test_expect_failure '--check and --exit-code are exclusive' ' +test_expect_success '--check and --exit-code are not exclusive' ' git checkout x && git diff --check --exit-code ' -test_expect_failure '--check and --quiet are exclusive' ' +test_expect_success '--check and --quiet are not exclusive' ' git diff --check --quiet |