fix

Author: wxiaoguang

models/migrations/v1_12/v136.go

@@ -84,12 +84,9 @@ func AddCommitDivergenceToPulls(x *xorm.Engine) error {
 				log.Error("Missing base repo with id %d for PR ID %d", pr.BaseRepoID, pr.ID)
 				continue
 			}
-
+			repoStore := repo_model.StorageRepo(repo_model.RelativePath(baseRepo.OwnerName, baseRepo.Name))
 			gitRefName := fmt.Sprintf("refs/pull/%d/head", pr.Index)
-
-			divergence, err := gitrepo.GetDivergingCommits(graceful.GetManager().HammerContext(),
-				repo_model.StorageRepo(repo_model.RelativePath(baseRepo.OwnerName, baseRepo.Name)),
-				pr.BaseBranch, gitRefName)
+			divergence, err := gitrepo.GetDivergingCommits(graceful.GetManager().HammerContext(), repoStore, pr.BaseBranch, gitRefName)
 			if err != nil {
 				log.Warn("Could not recalculate Divergence for pull: %d", pr.ID)
 				pr.CommitsAhead = 0

modules/gitrepo/gitrepo.go

@@ -20,8 +20,8 @@ type Repository interface {
 	RelativePath() string // We don't assume how the directory structure of the repository is, so we only need the relative path
 }
 
-// RelativePath should be a unix style path like username/reponame.git
-// This method should change it according to the current OS.
+// repoPath resolves the Repository.RelativePath (which is a unix-style path like "username/reponame.git")
+// to a local filesystem path according to setting.RepoRootPath
 var repoPath = func(repo Repository) string {
 	return filepath.Join(setting.RepoRootPath, filepath.FromSlash(repo.RelativePath()))
 }

modules/gitrepo/main_test.go

@@ -11,6 +11,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/tempdir"
+	"code.gitea.io/gitea/modules/test"
 )
 
 func TestMain(m *testing.M) {
@@ -21,8 +22,9 @@ func TestMain(m *testing.M) {
 	defer cleanup()
 
 	// resolve repository path relative to the test directory
+	testRootDir := test.SetupGiteaRoot()
 	repoPath = func(repo Repository) string {
-		return filepath.Join("../git/tests/repos", repo.RelativePath())
+		return filepath.Join(testRootDir, "/modules/git/tests/repos", repo.RelativePath())
 	}
 
 	setting.Git.HomePath = gitHomePath