gitea/services
zeripath f1e85622da
Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004)
The current TestPatch conflict code uses a plain git apply which does not properly
account for 3-way merging. However, we can improve things using `git read-tree -m` to
do a three-way merge then follow the algorithm used in merge-one-file. We can also use 
`--patience` and/or `--histogram` to generate a nicer diff for applying patches too.

Fix #13679
Fix #6417

Signed-off-by: Andrew Thornton <art27@cantab.net>
2021-12-19 05:19:25 +01:00
..
agit Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
asymkey Add missing `X-Total-Count` and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
attachment Move user related model into models/user (#17781) 2021-11-24 17:49:20 +08:00
auth Add Option to synchronize Admin & Restricted states from OIDC/OAuth2 along with Setting Scopes (#16766) 2021-12-14 16:37:11 +08:00
comments Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
cron Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
externalaccount Refactor HTTP request context (#17979) 2021-12-15 14:59:57 +08:00
forms Add Reindex buttons to repository settings page (#17494) 2021-12-16 23:55:12 +08:00
gitdiff Make Requests Processes and create process hierarchy. Associate OpenRepository with context. (#17125) 2021-11-30 20:06:32 +00:00
issue Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
lfs Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
mailer Add missing `X-Total-Count` and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
migrations Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
mirror Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
org Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
pull Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality (#18004) 2021-12-19 05:19:25 +01:00
release Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
repository Fix rename notification bug (#18008) 2021-12-17 14:24:47 +08:00
task Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
user Move keys to models/asymkey (#17917) 2021-12-10 16:14:24 +08:00
webhook Add missing `X-Total-Count` and fix some related bugs (#17968) 2021-12-15 13:39:34 +08:00
wiki Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00