You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		2 years ago
..
agit	Add more linters to improve code readability (#19989)	2 years ago
asymkey	Move issues related files into models/issues (#19931)	2 years ago
attachment	Move almost all functions' parameter db.Engine to context.Context (#19748)	2 years ago
auth	Fix various typos (#20338)	2 years ago
automerge	Add more linters to improve code readability (#19989)	2 years ago
comments	Move issues related files into models/issues (#19931)	2 years ago
context	Move almost all functions' parameter db.Engine to context.Context (#19748)	2 years ago
cron	Make better use of i18n (#20096)	2 years ago
externalaccount	Refactor auth package (#17962)	3 years ago
forms	Implement sync push mirror on commit (#19411)	2 years ago
gitdiff	Improve code diff highlight, fix incorrect rendered diff result (#19958)	2 years ago
issue	Check if project has the same repository id with issue when assign project to issue (#20133)	2 years ago
lfs	Move some code into models/git (#19879)	2 years ago
mailer	Added email notification option to receive all own messages (#20179)	2 years ago
migrations	Add tests for the host checking logic, clarify the behaviors (#20328)	2 years ago
mirror	Implement sync push mirror on commit (#19411)	2 years ago
org	Move almost all functions' parameter db.Engine to context.Context (#19748)	2 years ago
packages	Add Docker /v2/_catalog endpoint (#20469)	2 years ago
pull	Ensure that all unmerged files are merged when conflict checking (#20528)	2 years ago
release	fix permission check for delete tag (#19985)	2 years ago
repository	Slightly simplify LastCommitCache (#20444)	2 years ago
task	Add more linters to improve code readability (#19989)	2 years ago
user	Fix: Actor is required to get user repositories (#20443)	2 years ago
webhook	Add more linters to improve code readability (#19989)	2 years ago
wiki	Move some helper files out of models (#19355)	2 years ago