USEFULL
/
gogs
mirror of https://github.com/gogs/gogs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/4709/merge
Unknwon 2017-11-22 14:12:52 -05:00
parent f12c058b78
commit dd245fe8bd
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

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