Browse Source

Prevent nil pointer in GetPullRequestCommitStatusState (#10342)

Ensure that pr.HeadRepo is loaded before using it in GetPullRequestCommitStatusState.

Fixes error on merging with successful commit merge statuses.
tags/v1.12.0-dev
zeripath GitHub 6 years ago
parent
commit
481e283f9e
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      services/pull/commit_status.go

+ 5
- 0
services/pull/commit_status.go View File

@@ -91,6 +91,11 @@ func IsPullCommitStatusPass(pr *models.PullRequest) (bool, error) {


// GetPullRequestCommitStatusState returns pull request merged commit status state // GetPullRequestCommitStatusState returns pull request merged commit status state
func GetPullRequestCommitStatusState(pr *models.PullRequest) (structs.CommitStatusState, error) { 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 // check if all required status checks are successful
headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath()) headGitRepo, err := git.OpenRepository(pr.HeadRepo.RepoPath())
if err != nil { if err != nil {


Loading…
Cancel
Save