about summary refs log tree commit diff
path: root/third_party/git/t/t4124-apply-ws-rule.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t4124-apply-ws-rule.sh
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t4124-apply-ws-rule.sh')
-rwxr-xr-xthird_party/git/t/t4124-apply-ws-rule.sh10
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
 
 '