Fix signature of fcntl() compatibility dummy

diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45daec54ec3fa4be2229dbafebd879493eb..0391a5827ea8ba196b7796b7df818f8ac860c387 100755 (executable)
--- 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
@@ -123,7 +138,7 @@ test_expect_success 'check detects leftover conflict markers' '
                git --no-pager diff --cached --check >test.out
                test $? = 2
        ) &&
-       test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+       test 3 = $(grep "conflict marker" test.out | wc -l) &&
        git reset --hard
 '