Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-02 17:20:53 +02:00
Code Issues Activity

Fix panic on push at #7611 (#7615) (#7618)

Browse Source 
* 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
This commit is contained in:
zeripath authored and GitHub committed 2019-07-25 22:23:52 +01:00
1 parent 5a3d9861ba
commit b7e41f7b8f
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/pull/merge.go
+1 -1
View File
@@ -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())
}