fix

Author: wxiaoguang

modules/gitrepo/gitrepo.go

@@ -20,9 +20,9 @@ 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 an unix style path like username/reponame.git
+// RelativePath should be a unix style path like username/reponame.git
 // This method should change it according to the current OS.
-func repoPath(repo Repository) string {
+var repoPath = func(repo Repository) string {
 	return filepath.Join(setting.RepoRootPath, filepath.FromSlash(repo.RelativePath()))
 }
 

modules/gitrepo/main_test.go

@@ -4,32 +4,27 @@
 package gitrepo
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 	"testing"
 
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
-)
-
-const (
-	testReposDir = "../git/tests/repos/"
+	"code.gitea.io/gitea/modules/tempdir"
 )
 
 func TestMain(m *testing.M) {
-	// since all test repository is defined by testReposDir, we need to set it here
-	// So that all functions could work properly because Repository will only contain
-	// Relative Path to RepoRootPath
-	setting.RepoRootPath, _ = filepath.Abs(testReposDir)
-	// TODO: run command requires a home directory, we could set it to a temp dir
-	gitHomePath, err := os.MkdirTemp(os.TempDir(), "git-home")
+	gitHomePath, cleanup, err := tempdir.OsTempDir("gitea-test").MkdirTempRandom("git-home")
 	if err != nil {
-		panic(fmt.Errorf("unable to create temp dir: %w", err))
+		log.Fatal("Unable to create temp dir: %v", err)
 	}
-	defer util.RemoveAll(gitHomePath)
-	setting.Git.HomePath = gitHomePath
+	defer cleanup()
 
-	exitStatus := m.Run()
-	os.Exit(exitStatus)
+	// resolve repository path relative to the test directory
+	repoPath = func(repo Repository) string {
+		return filepath.Join("../git/tests/repos", repo.RelativePath())
+	}
+
+	setting.Git.HomePath = gitHomePath
+	os.Exit(m.Run())
 }

services/pull/pull.go

@@ -469,7 +469,7 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
 			return
 		}
 		for _, pr := range prs {
-			pr.BaseRepo = baseRepo // avoid loading again
+			pr.BaseRepo = baseRepo // avoid loading again // FIXME: why only here does so but the code above doesn't do so
 			divergence, err := GetDiverging(ctx, pr)
 			if err != nil {
 				if git_model.IsErrBranchNotExist(err) && !gitrepo.IsBranchExist(ctx, pr.HeadRepo, pr.HeadBranch) {
@@ -491,7 +491,7 @@ func AddTestPullRequestTask(opts TestPullRequestOptions) {
 // checkIfPRContentChanged checks if diff to target branch has changed by push
 // A commit can be considered to leave the PR untouched if the patch/diff with its merge base is unchanged
 func checkIfPRContentChanged(ctx context.Context, pr *issues_model.PullRequest, oldCommitID, newCommitID string) (hasChanged bool, err error) {
-	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)
+	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr) // FIXME: why it still needs to create a temp repo, since the alongside calls like GetDiverging doesn't do so anymore
 	if err != nil {
 		log.Error("CreateTemporaryRepoForPR %-v: %v", pr, err)
 		return false, err

services/pull/update.go

@@ -39,7 +39,7 @@ func Update(ctx context.Context, pr *issues_model.PullRequest, doer *user_model.
 		return fmt.Errorf("unable to load BaseRepo for PR[%d] during update-by-merge: %w", pr.ID, err)
 	}
 
-	if pr.ID > 0 { // only a real PR needs to check this
+	if pr.ID > 0 { // only a real PR needs to check this FIXME: why it needs this check?
 		diffCount, err := GetDiverging(ctx, pr)
 		if err != nil {
 			return err

services/repository/branch.go

@@ -187,7 +187,7 @@ func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *g
 			var err error
 			divergence, err = gitrepo.GetDivergingCommits(ctx, repo, repo.DefaultBranch, git.BranchPrefix+branchName)
 			if err != nil {
-				log.Error("CountDivergingCommits: %v", err)
+				log.Error("GetDivergingCommits: %v", err)
 			} else {
 				if err = putDivergenceFromCache(repo.ID, dbBranch.Name, divergence); err != nil {
 					log.Error("putDivergenceFromCache: %v", err)