core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force-push to base repo's ref/pull/#/head (#3393) 

* Force-push to base repo's ref/pull/#/head

Fixes force-pushing to pull request branches, otherwise failing with:

[...gitea/models/pull.go:1022 AddTestPullRequestTask()] [E] PushToBaseRepo: Push: exit status 1 - To /path/to/gitea-repositories/org/repo.git
 ! [rejected]        issue-fix -> refs/pull/20/head (non-fast-forward)

* format
This commit is contained in:
Sandro Santilli 2018-01-19 07:53:45 +01:00 committed by Lauris BH
parent ca306985d3
commit 05ab747054
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/pull.go
View File

@ -1010,6 +1010,7 @@ func (pr *PullRequest) PushToBaseRepo() (err error) {
if err = git.Push(headRepoPath, git.PushOptions{ if err = git.Push(headRepoPath, git.PushOptions{
Remote: tmpRemoteName, Remote: tmpRemoteName,
Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile), Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),
Force: true,
}); err != nil { }); err != nil {
return fmt.Errorf("Push: %v", err) return fmt.Errorf("Push: %v", err)
} }