mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 19:11:58 +01:00
d6b96627c1
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> |
||
|---|---|---|
| .. | ||
| advanced | ||
| developers | ||
| features | ||
| help | ||
| installation | ||
| packages | ||
| translation | ||
| upgrade | ||
| usage | ||
| advanced.en-us.md | ||
| advanced.fr-fr.md | ||
| advanced.zh-cn.md | ||
| advanced.zh-tw.md | ||
| developers.en-us.md | ||
| developers.zh-cn.md | ||
| developers.zh-tw.md | ||
| features.en-us.md | ||
| features.zh-cn.md | ||
| features.zh-tw.md | ||
| help.en-us.md | ||
| help.fr-fr.md | ||
| help.zh-cn.md | ||
| help.zh-tw.md | ||
| installation.en-us.md | ||
| installation.fr-fr.md | ||
| installation.zh-cn.md | ||
| installation.zh-tw.md | ||
| packages.en-us.md | ||
| translation.de-de.md | ||
| translation.en-us.md | ||
| translation.zh-tw.md | ||
| upgrade.en-us.md | ||
| upgrade.fr-fr.md | ||
| upgrade.zh-cn.md | ||
| upgrade.zh-tw.md | ||
| usage.en-us.md | ||
| usage.zh-cn.md | ||
| usage.zh-tw.md | ||