t4124 (apply --whitespace): use test_might_fail
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 31 Oct 2010 07:41:08 +0000 (02:41 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Nov 2010 23:20:44 +0000 (15:20 -0800)
Use test_might_fail instead of ignoring the exit status from git
config --unset, and let the exit status propagate past rm -f (which
does not fail on ENOENT). Otherwise bugs that lead git config to
crash would not be detected when this test runs.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4124-apply-ws-rule.sh
index 414b09b2b3d820852c86d0fa80d648417ca76f21..61bfc569c37eefa6dba4dd6f26513c61d71cfb9c 100755 (executable)
@@ -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 &&