Skip to content

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

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

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

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b23c35b
Improve TestPatch to use git read-tree -m
zeripath Dec 16, 2021
2f65bf9
Merge branch 'main' into update-TestPatch-to-use-read-tree
zeripath Dec 16, 2021
46bcf3e
Implement the git-merge-one-file algorithm
zeripath Dec 17, 2021
cb4e9e1
and handle empty patches too
zeripath Dec 17, 2021
507ede4
placate lint
zeripath Dec 17, 2021
7a523dd
use errConflict instead callback
zeripath Dec 17, 2021
8193743
Merge remote-tracking branch 'origin/main' into update-TestPatch-to-u…
zeripath Dec 17, 2021
70b0018
Merge branch 'main' into update-TestPatch-to-use-read-tree
zeripath Dec 18, 2021
490e958
Merge branch 'main' into update-TestPatch-to-use-read-tree
lunny Dec 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into update-TestPatch-to-use-read-tree
  • Loading branch information
@lunny
lunny authored Dec 19, 2021
commit 490e95867d282a3d2cef5a81a12220053644db58

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.