diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:26:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-05 06:26:39 (GMT) |
| commit | 8cc3709df0e4f8e4f2aca6ae68b5b4f145787252 (patch) | |
| tree | c7fbbae471651cc02514a02f78676168e9415d0b /t | |
| parent | 868cfe09237430d9d24f17ce2f16c03d4c39b58a (diff) | |
| parent | 1caaf225f86b7b1818103e72774e191fb1f3d0bb (diff) | |
| download | git-8cc3709df0e4f8e4f2aca6ae68b5b4f145787252.zip git-8cc3709df0e4f8e4f2aca6ae68b5b4f145787252.tar.gz git-8cc3709df0e4f8e4f2aca6ae68b5b4f145787252.tar.bz2 | |
Merge branch 'ld/maint-diff-quiet-w' into maint
* ld/maint-diff-quiet-w:
git-diff: add a test for git diff --quiet -w
git diff --quiet -w: check and report the status
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4017-diff-retval.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh index 60dd201..0391a58 100755 --- a/t/t4017-diff-retval.sh +++ b/t/t4017-diff-retval.sh @@ -5,6 +5,9 @@ test_description='Return value of diffs' . ./test-lib.sh test_expect_success 'setup' ' + echo "1 " >a && + git add . && + git commit -m zeroth && echo 1 >a && git add . && git commit -m first && @@ -13,6 +16,18 @@ test_expect_success 'setup' ' git commit -a -m second ' +test_expect_success 'git diff --quiet -w HEAD^^ HEAD^' ' + git diff --quiet -w HEAD^^ HEAD^ +' + +test_expect_success 'git diff --quiet HEAD^^ HEAD^' ' + test_must_fail git diff --quiet HEAD^^ HEAD^ +' + +test_expect_success 'git diff --quiet -w HEAD^ HEAD' ' + test_must_fail git diff --quiet -w HEAD^ HEAD +' + test_expect_success 'git diff-tree HEAD^ HEAD' ' git diff-tree --exit-code HEAD^ HEAD test $? = 1 |