]> source.dussan.org Git - gitea.git/commitdiff
Prevent nil pointer in GetPullRequestCommitStatusState (#10342)
authorzeripath <art27@cantab.net>
Tue, 18 Feb 2020 19:34:08 +0000 (19:34 +0000)
committerGitHub <noreply@github.com>
Tue, 18 Feb 2020 19:34:08 +0000 (19:34 +0000)
Ensure that pr.HeadRepo is loaded before using it in GetPullRequestCommitStatusState.

Fixes error on merging with successful commit merge statuses.

services/pull/commit_status.go

index 77aca485562f87bceb6827dab630ecba55ea74b6..a4803bfb9fecfb3735997c8f196f3ee4dcb320a4 100644 (file)
@@ -91,6 +91,11 @@ func IsPullCommitStatusPass(pr *models.PullRequest) (bool, error) {
 
 // GetPullRequestCommitStatusState returns pull request merged commit status state
 func GetPullRequestCommitStatusState(pr *models.PullRequest) (structs.CommitStatusState, error) {
+       // Ensure HeadRepo is loaded
+       if err := pr.LoadHeadRepo(); err != nil {
+               return "", errors.Wrap(err, "LoadHeadRepo")
+       }
+
        // check if all required status checks are successful
        headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
        if err != nil {