mirror of https://github.com/go-gitea/gitea.git
1463426a27
In Git 2.38, the `merge-tree` command introduced the `--write-tree` option, which works directly on bare repositories. In Git 2.40, a new parameter `--merge-base` introduced so we require Git 2.40 to use the merge tree feature. 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. It also fixes a possible situation that conflict files might be empty but it's a conflict status according to https://git-scm.com/docs/git-merge-tree#_mistakes_to_avoid Replace #35542 --------- Signed-off-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> |
||
|---|---|---|
| .. | ||
| archive.go | ||
| blame.go | ||
| blame_sha256_test.go | ||
| blame_test.go | ||
| branch.go | ||
| cat_file.go | ||
| clone.go | ||
| command.go | ||
| commit.go | ||
| commit_file.go | ||
| commit_file_test.go | ||
| commit_test.go | ||
| commitgraph.go | ||
| compare.go | ||
| compare_test.go | ||
| config.go | ||
| diff.go | ||
| fetch.go | ||
| fsck.go | ||
| gitrepo.go | ||
| hooks.go | ||
| main_test.go | ||
| merge.go | ||
| merge_tree.go | ||
| merge_tree_test.go | ||
| push.go | ||
| ref.go | ||
| remote.go | ||
| repo_lock.go | ||
| signing.go | ||
| size.go | ||
| tag.go | ||
| url.go | ||
| walk_gogit.go | ||
| walk_nogogit.go | ||