aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLarry D'Anna <larry@elder-gods.org>2010-02-21 21:58:44 -0500
committerJunio C Hamano <gitster@pobox.com>2010-02-21 21:57:19 -0800
commit1caaf225f86b7b1818103e72774e191fb1f3d0bb (patch)
treeda97a37696e5c2247b12b331e414fba174d55c50 /t
parent6977c250ac6cacb5ee441bff832fdeab4d0cd8f9 (diff)
downloadgit-1caaf225f86b7b1818103e72774e191fb1f3d0bb.tar.gz
git-1caaf225f86b7b1818103e72774e191fb1f3d0bb.tar.xz
git-diff: add a test for git diff --quiet -w
This patch adds two test cases for: 6977c25 git diff --quiet -w: check and report the status Signed-off-by: Larry D'Anna <larry@elder-gods.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t4017-diff-retval.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index 60dd2014d..0391a5827 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