Use merge tree to improve conflict checking performance when possible

[lunny]

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.

[wxiaoguang]

All old code (for SupportGitMergeTree=false) loses there test coverage?

[lunny]

All old code (for SupportGitMergeTree=false) loses there test coverage?

af79992 and e8636b7 added the two types of tests.

[lunny]

All old code (for SupportGitMergeTree=false) loses there test coverage?

It's ready to review again.

dismiss

[wxiaoguang]

• I don't think it's right to use integration tests to test "gitrepo" related code.
• I don't think it's right to use a general name like "DiffTree" but its implementation is for a special purpose.
• Why "doGitCommit" comes again? I have told you. So many many times, don't just copy-paste code!!!
  • Add rebase push display wrong comments bug #35560 (comment)
  • Don't ask my review, please, I had enough for keeping telling you this and that again and again, dozens of times.

[lunny]

• I don't think it's right to use integration tests to test "gitrepo" related code.

• I don't think it's right to use a general name like "DiffTree" but its implementation is for a special purpose.

• Why "doGitCommit" comes again? I have told you. So many many times, don't just copy-paste code!!!

  • Add rebase push display wrong comments bug #35560 (comment)
  • Don't ask my review, please, I had enough for keeping telling you this and that again and again, dozens of times.

All of these have been resolved.