zeripath 7a428fae4b Ensure that all unmerged files are merged when conflict checking (#20528) ... 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 #19527 Signed-off-by: Andrew Thornton <art27@cantab.net>		2022-07-29 01:19:55 +02:00
..
agit	Add more linters to improve code readability (#19989)	2022-06-20 12:02:49 +02:00
asymkey	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
attachment	Move almost all functions' parameter db.Engine to context.Context (#19748)	2022-05-20 22:08:52 +08:00
auth	Fix various typos (#20338)	2022-07-12 23:32:37 +02:00
automerge	Add more linters to improve code readability (#19989)	2022-06-20 12:02:49 +02:00
comments	Move issues related files into models/issues (#19931)	2022-06-13 17:37:59 +08:00
context	Move almost all functions' parameter db.Engine to context.Context (#19748)	2022-05-20 22:08:52 +08:00
cron	Make better use of i18n (#20096)	2022-06-26 22:19:22 +08:00
externalaccount	Refactor auth package (#17962)	2022-01-02 21:12:35 +08:00
forms	Implement sync push mirror on commit (#19411)	2022-07-08 20:45:12 +01:00
gitdiff	Improve code diff highlight, fix incorrect rendered diff result (#19958)	2022-07-23 19:28:02 +08:00
issue	Check if project has the same repository id with issue when assign project to issue (#20133)	2022-06-30 23:55:08 +08:00
lfs	Move some code into models/git (#19879)	2022-06-12 23:51:54 +08:00
mailer	Added email notification option to receive all own messages (#20179)	2022-07-28 16:30:12 +08:00
migrations	Add tests for the host checking logic, clarify the behaviors (#20328)	2022-07-13 09:07:16 +08:00
mirror	Implement sync push mirror on commit (#19411)	2022-07-08 20:45:12 +01:00
org	Move almost all functions' parameter db.Engine to context.Context (#19748)	2022-05-20 22:08:52 +08:00
packages	Add Docker /v2/_catalog endpoint (#20469)	2022-07-28 11:59:39 +08:00
pull	Ensure that all unmerged files are merged when conflict checking (#20528)	2022-07-29 01:19:55 +02:00
release	fix permission check for delete tag (#19985)	2022-06-16 22:03:03 +02:00
repository	Slightly simplify LastCommitCache (#20444)	2022-07-25 16:39:42 +01:00
task	Add more linters to improve code readability (#19989)	2022-06-20 12:02:49 +02:00
user	Fix: Actor is required to get user repositories (#20443)	2022-07-21 23:31:22 +02:00
webhook	Add more linters to improve code readability (#19989)	2022-06-20 12:02:49 +02:00
wiki	Move some helper files out of models (#19355)	2022-05-08 18:46:32 +02:00