Use merge tree to improve conflict checking performance when possible #35542
Conversation
GiteaBot
added
the
lgtm/need 2
GiteaBot
added
lgtm/need 1
GiteaBot
added
lgtm/blocked
| // skip this test if git version is low | ||
| if !git.DefaultFeatures().SupportProcReceive { | ||
| return | ||
| } |
There was a problem hiding this comment.
I don't think our CI env is that old, or any developer should use that old git to develop.
There was a problem hiding this comment.
Imho, we need to define a minimum git version, and then the code can work based on that assumption.
There was a problem hiding this comment.
here isn't really a problem (the if check should be removed)
the real problem is SupportGitMergeTree
There was a problem hiding this comment.
I don't think our CI env is that old, or any developer should use that old git to develop.
Added this check so that the test will not fail when running in an old git env. Some manually tests needs it.
There was a problem hiding this comment.
SupportProcReceive means 2.29
Git 2.29 was officially released on October 19, 2020.
I don't think our CI env is that old, or any developer should use that old git to develop.
Some manually tests needs it.
Why? Who? Where?
In Git 2.38, the merge-tree command introduced the --write-tree option, which works directly on bare repositories. This option produces the merged tree object ID, allowing us to perform diffs between commits without creating a temporary repository. By avoiding the overhead of setting up and tearing down temporary repos, this approach delivers a notable performance improvement.