Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-07 03:28:52 +02:00
Code Issues Activity

Fix pull merge 500 error caused by git-fetch breaking behaviors (#8194)

Browse Source
This commit is contained in:
Mura Li authored and techknowlogick committed 2019-09-16 13:27:05 -04:00
1 parent d78aa189ec
commit 9e8df4b838
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
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 // Fetch head branch
if err := git.NewCommand("fetch", remoteRepoName, pr.HeadBranch).RunInDirPipeline(tmpBasePath, nil, &errbuf); err != nil { if err := git.NewCommand("fetch", remoteRepoName, fmt.Sprintf("%s:refs/remotes/%s/%s", pr.HeadBranch, remoteRepoName, pr.HeadBranch)).RunInDirPipeline(tmpBasePath, nil, &errbuf); err != nil {
return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, errbuf.String()) return fmt.Errorf("git fetch [%s -> %s]: %s", headRepoPath, tmpBasePath, errbuf.String())
} }