meissa
/
forgejo
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
forgejo-federated-star
forgejo
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'd6b96627c1'
${ noResults }
forgejo/services
History
zeripath d6b96627c1
Add setting to disable the git apply step in test patch (#22130) 
For a long time Gitea has tested PR patches using a git apply --check
method, and in fact prior to the introduction of a read-tree assisted
three-way merge in #18004, this was the only way of checking patches.

Since #18004, the git apply --check method has been a fallback method,
only used when the read-tree three-way merge method has detected a
conflict. The read-tree assisted three-way merge method is much faster
and less resource intensive method of detecting conflicts. #18004 kept
the git apply method around because it was thought possible that this
fallback might be able to rectify conflicts that the read-tree three-way
merge detected. I am not certain if this could ever be the case.

Given the uncertainty here and the now relative stability of the
read-tree method - this PR makes using this fallback optional and
disables it by default. The hope is that users will not notice any
significant difference in conflict detection and we will be able to
remove the git apply fallback in future, and/or improve the read-tree
three-way merge method to catch any conflicts that git apply method
might have been able to fix.

An additional benefit is that patch checking should be significantly
less resource intensive and much quicker.

(See
https://github.com/go-gitea/gitea/issues/22083\#issuecomment-1347961737)

Ref #22083

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
 		2 years ago
..
agit Rename almost all Ctx functions (#22071) 2 years ago
asymkey Implement FSFE REUSE for golang files (#21840) 2 years ago
attachment Add API management for issue/pull and comment attachments (#21783) 2 years ago
auth refactor some functions to support ctx as first parameter (#21878) 2 years ago
automerge refactor some functions to support ctx as first parameter (#21878) 2 years ago
context Implement FSFE REUSE for golang files (#21840) 2 years ago
cron Add doctor command for full GC of LFS (#21978) 2 years ago
externalaccount Implement FSFE REUSE for golang files (#21840) 2 years ago
forms Allow disable code tab (#20805) 2 years ago
gitdiff Implement FSFE REUSE for golang files (#21840) 2 years ago
issue Rename almost all Ctx functions (#22071) 2 years ago
lfs refactor some functions to support ctx as first parameter (#21878) 2 years ago
mailer refactor some functions to support ctx as first parameter (#21878) 2 years ago
markup Implement FSFE REUSE for golang files (#21840) 2 years ago
migrations refactor some functions to support ctx as first parameter (#21878) 2 years ago
mirror Implement FSFE REUSE for golang files (#21840) 2 years ago
org Implement FSFE REUSE for golang files (#21840) 2 years ago
packages Update gitea-vet to check FSFE REUSE (#22004) 2 years ago
pull Add setting to disable the git apply step in test patch (#22130) 2 years ago
release Add API management for issue/pull and comment attachments (#21783) 2 years ago
repository Do not list active repositories as unadopted (#22034) 2 years ago
task Implement FSFE REUSE for golang files (#21840) 2 years ago
user Implement FSFE REUSE for golang files (#21840) 2 years ago
webhook Implement FSFE REUSE for golang files (#21840) 2 years ago
wiki Implement FSFE REUSE for golang files (#21840) 2 years ago