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

5 years ago · a5f87feefd
parent 89648746a5
commit a5f87feefd
1 changed files with 1 additions and 1 deletions
--- 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, 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())
 	}