mirror of https://github.com/go-gitea/gitea.git
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.
210b096da7
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> Co-authored-by: zeripath <art27@cantab.net> |
3 years ago | |
|---|---|---|
| .. | ||
| agit | 3 years ago | |
| asymkey | 3 years ago | |
| attachment | 3 years ago | |
| auth | 3 years ago | |
| automerge | 3 years ago | |
| comments | 3 years ago | |
| context | 3 years ago | |
| cron | 3 years ago | |
| externalaccount | 3 years ago | |
| forms | 3 years ago | |
| gitdiff | 3 years ago | |
| issue | 3 years ago | |
| lfs | 3 years ago | |
| mailer | 3 years ago | |
| migrations | 3 years ago | |
| mirror | 3 years ago | |
| org | 3 years ago | |
| packages | 3 years ago | |
| pull | 3 years ago | |
| release | 3 years ago | |
| repository | 3 years ago | |
| task | 3 years ago | |
| user | 3 years ago | |
| webhook | 3 years ago | |
| wiki | 3 years ago | |