mirror of
https://github.com/go-gitea/gitea.git
synced 2026-01-29 10:49:39 +01:00
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>
25 lines
604 B
Go
25 lines
604 B
Go
// Copyright 2025 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package gitrepo
|
|
|
|
import (
|
|
"path/filepath"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/modules/git"
|
|
"code.gitea.io/gitea/modules/test"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
// resolve repository path relative to the test directory
|
|
testRootDir := test.SetupGiteaRoot()
|
|
repoPath = func(repo Repository) string {
|
|
if filepath.IsAbs(repo.RelativePath()) {
|
|
return repo.RelativePath() // for testing purpose only
|
|
}
|
|
return filepath.Join(testRootDir, "modules/git/tests/repos", repo.RelativePath())
|
|
}
|
|
git.RunGitTests(m)
|
|
}
|