From 1a51a6fd32337b5f04c5c0bb70deac96cf0337de Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sun, 4 Jan 2026 23:14:38 -0800 Subject: [PATCH] Revert unnecessary change --- services/issue/pull.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/issue/pull.go b/services/issue/pull.go index 8fe033a633..85bf516b74 100644 --- a/services/issue/pull.go +++ b/services/issue/pull.go @@ -80,16 +80,13 @@ func PullRequestCodeOwnersReview(ctx context.Context, pr *issues_model.PullReque } // get the mergebase - if pr.MergeBase == "" { - mergeBase, err := gitrepo.MergeBase(ctx, pr.BaseRepo, git.BranchPrefix+pr.BaseBranch, pr.GetGitHeadRefName()) - if err != nil { - return nil, err - } - pr.MergeBase = mergeBase + mergeBase, err := gitrepo.MergeBase(ctx, pr.BaseRepo, git.BranchPrefix+pr.BaseBranch, pr.GetGitHeadRefName()) + if err != nil { + return nil, err } // https://github.com/go-gitea/gitea/issues/29763, we need to get the files changed // between the merge base and the head commit but not the base branch and the head commit - changedFiles, err := repo.GetFilesChangedBetween(pr.MergeBase, pr.GetGitHeadRefName()) + changedFiles, err := repo.GetFilesChangedBetween(mergeBase, pr.GetGitHeadRefName()) if err != nil { return nil, err }