test

wxiaoguang · wxiaoguang · commit 3e0ac84b819f · 2025-10-30T14:06:16.000+08:00
diff --git a/modules/git/repo_commit_test.go b/modules/git/repo_commit_test.go
@@ -124,7 +124,7 @@ func TestGetRefCommitID(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		commitID, err := bareRepo1.GetRefCommitIDNew(testCase.Ref)
+		commitID, err := bareRepo1.GetRefCommitIDOld(testCase.Ref)
 		if assert.NoError(t, err) {
 			assert.Equal(t, testCase.ExpectedCommitID, commitID)
 		}
diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go
@@ -96,7 +96,7 @@ func TestReadWritePullHead(t *testing.T) {
 	defer repo.Close()
 
 	// Try to open non-existing Pull
-	_, err = repo.GetRefCommitIDNew(PullPrefix + "0/head")
+	_, err = repo.GetRefCommitIDOld(PullPrefix + "0/head")
 	assert.Error(t, err)
 
 	// Write a fake sha1 with only 40 zeros
@@ -111,7 +111,7 @@ func TestReadWritePullHead(t *testing.T) {
 	}
 
 	// Read the file created
-	headContents, err := repo.GetRefCommitIDNew(PullPrefix + "1/head")
+	headContents, err := repo.GetRefCommitIDOld(PullPrefix + "1/head")
 	if err != nil {
 		assert.NoError(t, err)
 		return
diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go
@@ -166,7 +166,7 @@ func notify(ctx context.Context, input *notifyInput) error {
 		ref = git.RefNameFromBranch(input.Repo.DefaultBranch)
 	}
 
-	commitID, err := gitRepo.GetRefCommitIDNew(ref.String())
+	commitID, err := gitRepo.GetRefCommitIDOld(ref.String())
 	if err != nil {
 		return fmt.Errorf("gitRepo.GetRefCommitID: %w", err)
 	}
diff --git a/services/agit/agit.go b/services/agit/agit.go
@@ -213,7 +213,7 @@ func ProcReceive(ctx context.Context, repo *repo_model.Repository, gitRepo *git.
 			return nil, fmt.Errorf("unable to load base repository for PR[%d] Error: %w", pr.ID, err)
 		}
 
-		oldCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		oldCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			return nil, fmt.Errorf("unable to get ref commit id in base repository for PR[%d] Error: %w", pr.ID, err)
 		}
diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go
@@ -188,7 +188,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
 	}
 	defer baseGitRepo.Close()
 
-	headCommitID, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+	headCommitID, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 	if err != nil {
 		log.Error("GetRefCommitID: %v", err)
 		return
diff --git a/services/automergequeue/automergequeue.go b/services/automergequeue/automergequeue.go
@@ -40,7 +40,7 @@ func StartPRCheckAndAutoMerge(ctx context.Context, pull *issues_model.PullReques
 		return
 	}
 	defer gitRepo.Close()
-	commitID, err := gitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())
+	commitID, err := gitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())
 	if err != nil {
 		log.Error("GetRefCommitID: %v", err)
 		return
diff --git a/services/convert/pull.go b/services/convert/pull.go
@@ -170,7 +170,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 	}
 
 	if pr.Flow == issues_model.PullRequestFlowAGit {
-		apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			log.Error("GetRefCommitID[%s]: %v", pr.GetGitHeadRefName(), err)
 			return nil
@@ -210,7 +210,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u
 		)
 
 		if !exist {
-			headCommitID, err := headGitRepo.GetRefCommitIDNew(apiPullRequest.Head.Ref)
+			headCommitID, err := headGitRepo.GetRefCommitIDOld(apiPullRequest.Head.Ref)
 			if err != nil && !git.IsErrNotExist(err) {
 				log.Error("GetCommit[%s]: %v", pr.HeadBranch, err)
 				return nil
@@ -450,7 +450,7 @@ func ToAPIPullRequests(ctx context.Context, baseRepo *repo_model.Repository, prs
 		if pr.Flow == issues_model.PullRequestFlowAGit {
 			apiPullRequest.Head.Name = ""
 		}
-		apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			log.Error("GetRefCommitID[%s]: %v", pr.GetGitHeadRefName(), err)
 		}
diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go
@@ -879,7 +879,7 @@ func (g *GiteaLocalUploader) CreateReviews(ctx context.Context, reviews ...*base
 			continue
 		}
 
-		headCommitID, err := g.gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		headCommitID, err := g.gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		if err != nil {
 			log.Warn("PR #%d GetRefCommitID[%s] in %s/%s: %v, all review comments will be ignored", pr.Index, pr.GetGitHeadRefName(), g.repoOwner, g.repoName, err)
 			continue
diff --git a/services/mirror/mirror_pull.go b/services/mirror/mirror_pull.go
@@ -493,7 +493,7 @@ func SyncPullMirror(ctx context.Context, repoID int64) bool {
 
 		// Create reference
 		if result.oldCommitID == gitShortEmptySha {
-			commitID, err := gitRepo.GetRefCommitIDNew(result.refName.String())
+			commitID, err := gitRepo.GetRefCommitIDOld(result.refName.String())
 			if err != nil {
 				log.Error("SyncMirrors [repo: %-v]: unable to GetRefCommitID [ref_name: %s]: %v", m.Repo, result.refName, err)
 				continue
diff --git a/tests/integration/git_general_test.go b/tests/integration/git_general_test.go
@@ -844,7 +844,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 				Message: "Testing commit 1",
 			})
 			assert.NoError(t, err)
-			commit, err = gitRepo.GetRefCommitIDNew("HEAD")
+			commit, err = gitRepo.GetRefCommitIDOld("HEAD")
 			assert.NoError(t, err)
 		})
 
@@ -916,7 +916,7 @@ func doCreateAgitFlowPull(dstPath string, ctx *APITestContext, headBranch string
 				Message: "Testing commit 2",
 			})
 			assert.NoError(t, err)
-			commit, err = gitRepo.GetRefCommitIDNew("HEAD")
+			commit, err = gitRepo.GetRefCommitIDOld("HEAD")
 			assert.NoError(t, err)
 		})
 
diff --git a/tests/integration/git_misc_test.go b/tests/integration/git_misc_test.go
@@ -226,7 +226,7 @@ func TestAgitReviewStaleness(t *testing.T) {
 		assert.NoError(t, err)
 		defer baseGitRepo.Close()
 
-		updatedCommitID, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		updatedCommitID, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		assert.NoError(t, err)
 		t.Logf("Updated commit ID: %s", updatedCommitID)
 
diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go
@@ -842,7 +842,7 @@ func TestPullAutoMergeAfterCommitStatusSucceed(t *testing.T) {
 		// update commit status to success, then it should be merged automatically
 		baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
 		assert.NoError(t, err)
-		sha, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		sha, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		assert.NoError(t, err)
 		masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
 		assert.NoError(t, err)
@@ -924,7 +924,7 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApproval(t *testing.T) {
 		// update commit status to success, then it should be merged automatically
 		baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
 		assert.NoError(t, err)
-		sha, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		sha, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		assert.NoError(t, err)
 		masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
 		assert.NoError(t, err)
@@ -1055,7 +1055,7 @@ func TestPullAutoMergeAfterCommitStatusSucceedAndApprovalForAgitFlow(t *testing.
 		// update commit status to success, then it should be merged automatically
 		baseGitRepo, err := gitrepo.OpenRepository(t.Context(), baseRepo)
 		assert.NoError(t, err)
-		sha, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())
+		sha, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())
 		assert.NoError(t, err)
 		masterCommitID, err := baseGitRepo.GetBranchCommitID("master")
 		assert.NoError(t, err)

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func TestGetRefCommitID(t *testing.T) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`for _, testCase := range testCases {`
`127`		`- commitID, err := bareRepo1.GetRefCommitIDNew(testCase.Ref)`
	`127`	`+ commitID, err := bareRepo1.GetRefCommitIDOld(testCase.Ref)`
`128`	`128`	`if assert.NoError(t, err) {`
`129`	`129`	`assert.Equal(t, testCase.ExpectedCommitID, commitID)`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func notify(ctx context.Context, input *notifyInput) error {`
`166`	`166`	`ref = git.RefNameFromBranch(input.Repo.DefaultBranch)`
`167`	`167`	`}`
`168`	`168`
`169`		`- commitID, err := gitRepo.GetRefCommitIDNew(ref.String())`
	`169`	`+ commitID, err := gitRepo.GetRefCommitIDOld(ref.String())`
`170`	`170`	`if err != nil {`
`171`	`171`	`return fmt.Errorf("gitRepo.GetRefCommitID: %w", err)`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func ProcReceive(ctx context.Context, repo repo_model.Repository, gitRepo git.`
`213`	`213`	`return nil, fmt.Errorf("unable to load base repository for PR[%d] Error: %w", pr.ID, err)`
`214`	`214`	`}`
`215`	`215`
`216`		`- oldCommitID, err := gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())`
	`216`	`+ oldCommitID, err := gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())`
`217`	`217`	`if err != nil {`
`218`	`218`	`return nil, fmt.Errorf("unable to get ref commit id in base repository for PR[%d] Error: %w", pr.ID, err)`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {`
`188`	`188`	`}`
`189`	`189`	`defer baseGitRepo.Close()`
`190`	`190`
`191`		`- headCommitID, err := baseGitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())`
	`191`	`+ headCommitID, err := baseGitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())`
`192`	`192`	`if err != nil {`
`193`	`193`	`log.Error("GetRefCommitID: %v", err)`
`194`	`194`	`return`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func StartPRCheckAndAutoMerge(ctx context.Context, pull *issues_model.PullReques`
`40`	`40`	`return`
`41`	`41`	`}`
`42`	`42`	`defer gitRepo.Close()`
`43`		`- commitID, err := gitRepo.GetRefCommitIDNew(pull.GetGitHeadRefName())`
	`43`	`+ commitID, err := gitRepo.GetRefCommitIDOld(pull.GetGitHeadRefName())`
`44`	`44`	`if err != nil {`
`45`	`45`	`log.Error("GetRefCommitID: %v", err)`
`46`	`46`	`return`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func ToAPIPullRequest(ctx context.Context, pr issues_model.PullRequest, doer u`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`if pr.Flow == issues_model.PullRequestFlowAGit {`
`173`		`- apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())`
	`173`	`+ apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())`
`174`	`174`	`if err != nil {`
`175`	`175`	`log.Error("GetRefCommitID[%s]: %v", pr.GetGitHeadRefName(), err)`
`176`	`176`	`return nil`
`@@ -210,7 +210,7 @@ func ToAPIPullRequest(ctx context.Context, pr issues_model.PullRequest, doer u`
`210`	`210`	`)`
`211`	`211`
`212`	`212`	`if !exist {`
`213`		`- headCommitID, err := headGitRepo.GetRefCommitIDNew(apiPullRequest.Head.Ref)`
	`213`	`+ headCommitID, err := headGitRepo.GetRefCommitIDOld(apiPullRequest.Head.Ref)`
`214`	`214`	`if err != nil && !git.IsErrNotExist(err) {`
`215`	`215`	`log.Error("GetCommit[%s]: %v", pr.HeadBranch, err)`
`216`	`216`	`return nil`
`@@ -450,7 +450,7 @@ func ToAPIPullRequests(ctx context.Context, baseRepo *repo_model.Repository, prs`
`450`	`450`	`if pr.Flow == issues_model.PullRequestFlowAGit {`
`451`	`451`	`apiPullRequest.Head.Name = ""`
`452`	`452`	`}`
`453`		`- apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())`
	`453`	`+ apiPullRequest.Head.Sha, err = gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())`
`454`	`454`	`if err != nil {`
`455`	`455`	`log.Error("GetRefCommitID[%s]: %v", pr.GetGitHeadRefName(), err)`
`456`	`456`	`}`
Original file line number	Diff line number	Diff line change
`@@ -879,7 +879,7 @@ func (g GiteaLocalUploader) CreateReviews(ctx context.Context, reviews ...base`
`879`	`879`	`continue`
`880`	`880`	`}`
`881`	`881`
`882`		`- headCommitID, err := g.gitRepo.GetRefCommitIDNew(pr.GetGitHeadRefName())`
	`882`	`+ headCommitID, err := g.gitRepo.GetRefCommitIDOld(pr.GetGitHeadRefName())`
`883`	`883`	`if err != nil {`
`884`	`884`	`log.Warn("PR #%d GetRefCommitID[%s] in %s/%s: %v, all review comments will be ignored", pr.Index, pr.GetGitHeadRefName(), g.repoOwner, g.repoName, err)`
`885`	`885`	`continue`