diff options
Diffstat (limited to 'third_party/git/t/t4124-apply-ws-rule.sh')
| -rwxr-xr-x | third_party/git/t/t4124-apply-ws-rule.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/third_party/git/t/t4124-apply-ws-rule.sh b/third_party/git/t/t4124-apply-ws-rule.sh index 971a5a7512ac..ff51e9e78914 100755 --- a/third_party/git/t/t4124-apply-ws-rule.sh +++ b/third_party/git/t/t4124-apply-ws-rule.sh @@ -35,15 +35,9 @@ prepare_test_file () { } apply_patch () { - cmd_prefix= && - if test "x$1" = 'x!' - then - cmd_prefix=test_must_fail && - shift - fi && >target && sed -e "s|\([ab]\)/file|\1/target|" <patch | - $cmd_prefix git apply "$@" + git apply "$@" } test_fix () { @@ -105,7 +99,7 @@ test_expect_success 'whitespace=warn, default rule' ' test_expect_success 'whitespace=error-all, default rule' ' - apply_patch ! --whitespace=error-all && + test_must_fail apply_patch --whitespace=error-all && test_must_be_empty target ' |