gitea/services/pull
6543 210b096da7
Ensure that all unmerged files are merged when conflict checking (#20528) (#20536)
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>
2022-07-29 15:37:18 +02:00
..
check.go Fix checks in PR for empty commits (#20290) (#20352) 2022-07-13 18:36:23 +01:00
check_test.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
commit_status.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
edits.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
lfs.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
main_test.go Use a struct as test options (#19393) 2022-04-14 21:58:21 +08:00
merge.go Remove legacy git code (ver < 2.0), fine tune markup tests (#19930) 2022-06-16 23:47:44 +08:00
patch.go Ensure that all unmerged files are merged when conflict checking (#20528) (#20536) 2022-07-29 15:37:18 +02:00
patch_unmerged.go Ensure that all unmerged files are merged when conflict checking (#20528) (#20536) 2022-07-29 15:37:18 +02:00
pull.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
pull_test.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
review.go Dismiss prior pull reviews if done via web in review dismiss (#20197) (#20407) 2022-07-19 17:46:33 +02:00
temp_repo.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00
update.go Move issues related files into models/issues (#19931) 2022-06-13 17:37:59 +08:00