1
0
mirror of https://github.com/go-gitea/gitea.git synced 2024-12-04 14:46:57 -05:00
gitea/services
6543 210b096da7
Ensure that all unmerged files are merged when conflict checking () ()
There is a subtle bug in the code relating to collating the results of
`git ls-files -u -z` in `unmergedFiles()`. The code here makes the
mistake of assuming that every unmerged file will always have a stage 1
conflict, and this results in conflicts that occur in stage 3 only being
dropped.

This PR simply adjusts this code to ensure that any empty unmergedFile
will always be passed down the channel.

The PR also adds a lot of Trace commands to attempt to help find future
bugs in this code.

Fix 

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: zeripath <art27@cantab.net>
2022-07-29 15:37:18 +02:00
..
agit move agit dependcy () 2022-06-17 20:17:12 +02:00
asymkey Move issues related files into models/issues () 2022-06-13 17:37:59 +08:00
attachment Move almost all functions' parameter db.Engine to context.Context () 2022-05-20 22:08:52 +08:00
auth EscapeFilter the group dn membership () () 2022-07-06 20:51:40 +01:00
automerge Move issues related files into models/issues () 2022-06-13 17:37:59 +08:00
comments Move issues related files into models/issues () 2022-06-13 17:37:59 +08:00
context Move almost all functions' parameter db.Engine to context.Context () 2022-05-20 22:08:52 +08:00
cron Move some code into models/git () 2022-06-12 23:51:54 +08:00
externalaccount Refactor auth package () 2022-01-02 21:12:35 +08:00
forms Move issues related files into models/issues () 2022-06-13 17:37:59 +08:00
gitdiff Remove legacy git code (ver < 2.0), fine tune markup tests () 2022-06-16 23:47:44 +08:00
issue Check if project has the same repository id with issue when assign project to issue () () 2022-07-01 15:00:05 +02:00
lfs Move some code into models/git () 2022-06-12 23:51:54 +08:00
mailer Move issues related files into models/issues () 2022-06-13 17:37:59 +08:00
migrations Correctly handle draft releases without a tag () () 2022-07-12 19:55:25 +01:00
mirror Always try to fetch repo for mirrors () 2022-06-15 23:58:44 +08:00
org Move almost all functions' parameter db.Engine to context.Context () 2022-05-20 22:08:52 +08:00
packages Package registry changes () 2022-04-06 03:32:09 +02:00
pull Ensure that all unmerged files are merged when conflict checking () () 2022-07-29 15:37:18 +02:00
release fix permission check for delete tag () 2022-06-16 22:03:03 +02:00
repository Remove legacy git code (ver < 2.0), fine tune markup tests () 2022-06-16 23:47:44 +08:00
task Use a more general (and faster) method to sanitize URLs with credentials () 2022-03-31 10:25:40 +08:00
user Move almost all functions' parameter db.Engine to context.Context () 2022-05-20 22:08:52 +08:00
webhook fix(telegram): fix link bot to release tag () 2022-05-28 16:44:51 -04:00
wiki Move some helper files out of models () 2022-05-08 18:46:32 +02:00