revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232
, reversing changes made tof2b211131f
.
This commit is contained in:
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
10
third_party/git/t/t4124-apply-ws-rule.sh
vendored
10
third_party/git/t/t4124-apply-ws-rule.sh
vendored
|
@ -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
|
||||
|
||||
'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue