mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-18 03:17:56 +01:00
7a428fae4b
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> |
||
|---|---|---|
| .. | ||
| check.go | ||
| check_test.go | ||
| commit_status.go | ||
| edits.go | ||
| lfs.go | ||
| main_test.go | ||
| merge.go | ||
| patch.go | ||
| patch_unmerged.go | ||
| pull.go | ||
| pull_test.go | ||
| review.go | ||
| temp_repo.go | ||
| update.go | ||