Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ensure that all unmerged files are merged when conflict checking #20528

Merged
merged 3 commits into from
Jul 28, 2022
Merged

Ensure that all unmerged files are merged when conflict checking #20528

merged 3 commits into from
Jul 28, 2022

Commits on Jul 28, 2022

  1. Ensure that all unmerged files are merged when conflict checking 

    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 go-gitea#19527

Signed-off-by: Andrew Thornton <[email protected]>
    @zeripath
    zeripath committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c2bd98a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fix-19527-prevent-missed-unmerged

    @zeripath
    zeripath authored Jul 28, 2022
    Configuration menu
    Copy the full SHA
    f4e6a9f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fix-19527-prevent-missed-unmerged

    @6543
    6543 authored Jul 28, 2022
    Configuration menu
    Copy the full SHA
    0833a3f View commit details
    Browse the repository at this point in the history