Merge branch 'ak/gitweb-fit-image'

diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 9e1d64c6ac5ba2d652a7657aca4411da6d5a08aa..63beb99828cc17d2ec8218a6470b62c02a78806b 100755 (executable)
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -779,21 +779,21 @@ test_expect_success PIPE 'streaming support for --stdin' '
 #
 # test whitespace handling
 
-test_expect_success 'trailing whitespace is warned' '
+test_expect_success 'trailing whitespace is ignored' '
        mkdir whitespace &&
        >whitespace/trailing &&
        >whitespace/untracked &&
        echo "whitespace/trailing   " >ignore &&
        cat >expect <<EOF &&
-whitespace/trailing
 whitespace/untracked
 EOF
+       : >err.expect &&
        git ls-files -o -X ignore whitespace >actual 2>err &&
-       grep "ignore:.*'\''whitespace/trailing   '\''" err &&
-       test_cmp expect actual
+       test_cmp expect actual &&
+       test_cmp err.expect err
 '
 
-test_expect_success 'quoting allows trailing whitespace' '
+test_expect_success !MINGW 'quoting allows trailing whitespace' '
        rm -rf whitespace &&
        mkdir whitespace &&
        >"whitespace/trailing  " &&