Skip to content

Commit 33fc521

Browse files
jrngitster
authored andcommitted
t4124 (apply --whitespace): use test_might_fail
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>
1 parent 56641f1 commit 33fc521

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

t/t4124-apply-ws-rule.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,8 @@ test_expect_success 'trailing whitespace & no newline at the end of file' '
176176
'
177177

178178
test_expect_success 'blank at EOF with --whitespace=fix (1)' '
179-
: these can fail depending on what we did before
180-
git config --unset core.whitespace
181-
rm -f .gitattributes
179+
test_might_fail git config --unset core.whitespace &&
180+
rm -f .gitattributes &&
182181
183182
{ echo a; echo b; echo c; } >one &&
184183
git add one &&

0 commit comments

Comments
 (0)