Merge branch 'rj/sparse-flags'

diff --git a/t/t0025-crlf-renormalize.sh b/t/t0025-crlf-renormalize.sh
index 9d9e02a21112197a2a57a2877db24951d41a2996..e13363ade5cf500e6f57677eb961c5ca01197a12 100755 (executable)
--- a/t/t0025-crlf-renormalize.sh
+++ b/t/t0025-crlf-renormalize.sh
@@ -27,4 +27,13 @@ test_expect_success 'renormalize CRLF in repo' '
        test_cmp expect actual
 '
 
+test_expect_success 'ignore-errors not mistaken for renormalize' '
+       git reset --hard &&
+       echo "*.txt text=auto" >.gitattributes &&
+       git ls-files --eol >expect &&
+       git add --ignore-errors "*.txt" &&
+       git ls-files --eol >actual &&
+       test_cmp expect actual
+'
+
 test_done