Explorar el Código

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

tags/v1.9.4
Mura Li hace 4 años
padre
commit
9e8df4b838
Se han modificado 1 ficheros con 1 adiciones y 1 borrados
  1. 1
    1
      modules/pull/merge.go

+ 1
- 1
modules/pull/merge.go Ver fichero

@@ -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())
}


Cargando…
Cancelar
Guardar