Browse Source

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

pull/4709/merge
Unknwon 7 years ago
parent
commit
dd245fe8bd
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
  1. 2
      models/pull.go

2
models/pull.go

@ -282,7 +282,7 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository, mergeStyle
// Push back to upstream. // Push back to upstream.
if _, stderr, err = process.ExecDir(-1, tmpBasePath, if _, stderr, err = process.ExecDir(-1, tmpBasePath,
fmt.Sprintf("PullRequest.Merge (git push): %s", 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) return fmt.Errorf("git push: %s", stderr)
} }

Loading…
Cancel
Save