forgejo/docs/content/doc
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>
2022-12-19 19:37:15 +08:00
..
advanced Add setting to disable the git apply step in test patch (#22130) 2022-12-19 19:37:15 +08:00
developers Refactor docs (#21627) 2022-10-31 23:16:19 +00:00
features Improve documentation for PAM and static deployment (#21866) 2022-11-20 20:14:03 +00:00
help Attempt clarify AppWorkPath etc. (#21656) 2022-11-09 20:22:31 -05:00
installation Fix markdown typo of an extra backtick in docs (#22123) 2022-12-13 18:20:36 -06:00
packages Add pnpm to packages/overview (#22008) 2022-12-02 11:23:47 -05:00
translation Add plural definitions for German translations (#21802) 2022-11-13 11:58:21 -05:00
upgrade Add redirect of /upgrade/ to /upgrade-from-gitea/ on docs site (#21330) 2022-10-06 21:53:02 +01:00
usage Refactor docs (#21627) 2022-10-31 23:16:19 +00:00
advanced.en-us.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
advanced.fr-fr.md General documentation cleanup (#3317) 2018-01-08 23:48:42 +01:00
advanced.zh-cn.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
advanced.zh-tw.md [docs] Add zh-tw Translations (#14507) 2021-01-29 01:57:58 +01:00
developers.en-us.md Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
developers.zh-cn.md Refactor docs (#21627) 2022-10-31 23:16:19 +00:00
developers.zh-tw.md Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
features.en-us.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
features.zh-cn.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
features.zh-tw.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
help.en-us.md Implement documentation search (#8937) 2019-11-13 18:03:18 +00:00
help.fr-fr.md Implement documentation search (#8937) 2019-11-13 18:03:18 +00:00
help.zh-cn.md Implement documentation search (#8937) 2019-11-13 18:03:18 +00:00
help.zh-tw.md [docs] Add zh-tw Translations (#14507) 2021-01-29 01:57:58 +01:00
installation.en-us.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
installation.fr-fr.md General documentation cleanup (#3317) 2018-01-08 23:48:42 +01:00
installation.zh-cn.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
installation.zh-tw.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
packages.en-us.md Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
translation.de-de.md Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
translation.en-us.md Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
translation.zh-tw.md Add Package Registry (#16510) 2022-03-30 16:42:47 +08:00
upgrade.en-us.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
upgrade.fr-fr.md General documentation cleanup (#3317) 2018-01-08 23:48:42 +01:00
upgrade.zh-cn.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
upgrade.zh-tw.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
usage.en-us.md Import docs into main repository (#2874) 2017-11-26 23:44:32 +02:00
usage.zh-cn.md ZH-CN translation of Usage part (#5086) 2018-10-17 14:19:04 -04:00
usage.zh-tw.md [docs] Add zh-tw Translations (#14507) 2021-01-29 01:57:58 +01:00