refactor: git repo and relative path handling (#38522)

1. simplify "StorageRepo" code
2. simplify git.OpenRepository code
3. by the way, clean up some unused files in git test fixtures.
This commit is contained in:
wxiaoguang
2026-07-19 15:32:00 +08:00
committed by GitHub
parent ae176cd649
commit b06002f449
100 changed files with 315 additions and 290 deletions
+4 -7
View File
@@ -10,18 +10,15 @@ import (
"gitea.dev/modules/git"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
var testReposDir = "tests/repos/"
func TestVerifyCommits(t *testing.T) {
unittest.PrepareTestEnv(t)
gitRepo, err := git.OpenRepository(testReposDir + "repo1_hook_verification")
if err != nil {
defer gitRepo.Close()
}
assert.NoError(t, err)
gitRepo, err := git.OpenRepositoryLocal("tests/repos/repo1_hook_verification")
require.NoError(t, err)
defer gitRepo.Close()
objectFormat, err := gitRepo.GetObjectFormat(t.Context())
assert.NoError(t, err)
+3 -1
View File
@@ -14,6 +14,7 @@ import (
"gitea.dev/models/unit"
user_model "gitea.dev/models/user"
"gitea.dev/modules/git"
"gitea.dev/modules/git/gitcmd"
"gitea.dev/modules/log"
"gitea.dev/modules/private"
"gitea.dev/modules/setting"
@@ -318,7 +319,8 @@ func ServCommand(ctx *context.PrivateContext) {
}
}
results.RepoStoragePath = util.Iif(results.IsWiki, repo_model.RelativeWikiPath(repo.OwnerName, repo.Name), repo.GitRepoLocation())
gitRepo := util.Iif(results.IsWiki, repo.WikiStorageRepo(), repo.CodeStorageRepo())
results.RepoStoragePath = gitcmd.RepoLocalPath(gitRepo)
log.Debug("Serv Results: %+v", results)
ctx.JSON(http.StatusOK, results)
// We will update the keys in a different call.