diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-10-31 02:41:08 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-11-09 15:20:44 -0800 |
| commit | 33fc521193746a0961c270997dbb881b520ad793 (patch) | |
| tree | df3efbeecff9826bbe66aceab42cc30abb8dad40 /t | |
| parent | t3404: do not use 'describe' to implement test_cmp_rev (diff) | |
| download | tgif-33fc521193746a0961c270997dbb881b520ad793.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4124-apply-ws-rule.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh index 414b09b2b3..61bfc569c3 100755 --- 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 && |