From b7e41f7b8fb26abb12b6f563586b060c03f79320 Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 25 Jul 2019 22:23:52 +0100 Subject: [PATCH] Fix panic on push at #7611 (#7615) (#7618) * Fix panic in #7611 Use pr.IssueID instead of pr.Issue.ID as Issue may not be loaded and is unnecessary * Only fetch the head branch from the remote --- models/branches.go | 2 +- modules/pull/merge.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/models/branches.go b/models/branches.go index fa4215d6a0..c5b8daf64c 100644 --- a/models/branches.go +++ b/models/branches.go @@ -101,7 +101,7 @@ func (protectBranch *ProtectedBranch) HasEnoughApprovals(pr *PullRequest) bool { // GetGrantedApprovalsCount returns the number of granted approvals for pr. A granted approval must be authored by a user in an approval whitelist. func (protectBranch *ProtectedBranch) GetGrantedApprovalsCount(pr *PullRequest) int64 { - reviews, err := GetReviewersByPullID(pr.Issue.ID) + reviews, err := GetReviewersByPullID(pr.IssueID) if err != nil { log.Error("GetReviewersByPullID: %v", err) return 0 diff --git a/modules/pull/merge.go b/modules/pull/merge.go index 3b653aac2d..3e5721ad72 100644 --- a/modules/pull/merge.go +++ b/modules/pull/merge.go @@ -101,7 +101,7 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor } // Fetch head branch - if err := git.NewCommand("fetch", remoteRepoName).RunInDirPipeline(tmpBasePath, nil, &errbuf); err != nil { + if err := git.NewCommand("fetch", remoteRepoName, pr.HeadBranch).RunInDirPipeline(tmpBasePath, nil, &errbuf); err != nil { return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, errbuf.String()) }