Merge branch 'maint'

diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index c6474de4c8c30eba9b5375f6c4e176e67c1fd001..d350065f25c2fb8cd61d9f12f720cf315aa3436d 100755 (executable)
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -99,9 +99,8 @@ test_expect_success 'whitespace=warn, default rule' '
 
 test_expect_success 'whitespace=error-all, default rule' '
 
-       apply_patch --whitespace=error-all && return 1
-       test -s target && return 1
-       : happy
+       test_must_fail apply_patch --whitespace=error-all &&
+       ! test -s target
 
 '