Explorar o código

pull_request: fix changes not pushed to upstream if between two repositories (#4890)

Unknwon %!s(int64=6) %!d(string=hai) anos
pai
achega
dd245fe8bd
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      models/pull.go

+ 1 - 1
models/pull.go

@@ -282,7 +282,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
 	// Push back to upstream.
 	if _, stderr, err = process.ExecDir(-1, tmpBasePath,
 		fmt.Sprintf("PullRequest.Merge (git push): %s", tmpBasePath),
-		"git", "push", "head_repo", "HEAD:"+pr.BaseBranch); err != nil {
+		"git", "push", baseGitRepo.Path, pr.BaseBranch); err != nil {
 		return fmt.Errorf("git push: %s", stderr)
 	}