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

Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality #18004

Merged
merged 9 commits into from
Dec 19, 2021
Merged

Improve TestPatch to use git read-tree -m and implement git-merge-one-file functionality #18004

merged 9 commits into from
Dec 19, 2021

Commits on Dec 16, 2021

  1. Improve TestPatch to use git read-tree -m 

    The current TestPatch conflict code uses a plain git apply which does not properly
account for 3-way merging. However, we can improve things using `git read-tree -m` to
do a three-way merge. We can also use `--patience` to generate a nicer diff for
applying patches too.

Fix go-gitea#13679

Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    b23c35b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into update-TestPatch-to-use-read-tree

    @zeripath
    zeripath authored Dec 16, 2021
    Configuration menu
    Copy the full SHA
    2f65bf9 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Implement the git-merge-one-file algorithm 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    46bcf3e View commit details
    Browse the repository at this point in the history

  2. and handle empty patches too 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    cb4e9e1 View commit details
    Browse the repository at this point in the history

  3. placate lint 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    507ede4 View commit details
    Browse the repository at this point in the history

  4. use errConflict instead callback 

    Signed-off-by: Andrew Thornton <art27@cantab.net>
    @zeripath
    zeripath committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    7a523dd View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/main' into update-TestPatch-to-u… 

    …se-read-tree
    @zeripath
    zeripath committed Dec 17, 2021
    Configuration menu
    Copy the full SHA
    8193743 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2021

  1. Merge branch 'main' into update-TestPatch-to-use-read-tree

    @zeripath
    zeripath authored Dec 18, 2021
    Configuration menu
    Copy the full SHA
    70b0018 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2021

  1. Merge branch 'main' into update-TestPatch-to-use-read-tree

    @lunny
    lunny authored Dec 19, 2021
    Configuration menu
    Copy the full SHA
    490e958 View commit details
    Browse the repository at this point in the history