Merge branch 'nd/maint-hide-checkout-index-from-error'

diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 414b09b2b3d820852c86d0fa80d648417ca76f21..61bfc569c37eefa6dba4dd6f26513c61d71cfb9c 100755 (executable)
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -176,9 +176,8 @@ test_expect_success 'trailing whitespace & no newline at the end of file' '
 '
 
 test_expect_success 'blank at EOF with --whitespace=fix (1)' '
-       : these can fail depending on what we did before
-       git config --unset core.whitespace
-       rm -f .gitattributes
+       test_might_fail git config --unset core.whitespace &&
+       rm -f .gitattributes &&
 
        { echo a; echo b; echo c; } >one &&
        git add one &&