diff options
| author | zeripath <art27@cantab.net> | 2019-07-25 19:05:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 19:05:51 +0100 |
| commit | 6485962dd53d9704f0a2b438257f722a306beedd (patch) | |
| tree | 1f75ed04bb54afe5d266a864b8b06426296b3418 | |
| parent | 734aa965088fb72330f4ad744c187c614cce3d8b (diff) | |
| download | gitea-6485962dd53d9704f0a2b438257f722a306beedd.tar.gz gitea-6485962dd53d9704f0a2b438257f722a306beedd.zip | |
Fix panic on push at #7611 (#7615)
* 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
| -rw-r--r-- | models/branches.go | 2 | ||||
| -rw-r--r-- | modules/pull/merge.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/models/branches.go b/models/branches.go index c09e72e988..3d3cff84d3 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()) } |