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

strk · lafriks · commit 05ab747054ad · 2018-01-19T08:53:45.000+02:00
* 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 -&gt; refs/pull/20/head (non-fast-forward)

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

Original file line number	Diff line number	Diff line change
`@@ -1010,6 +1010,7 @@ func (pr *PullRequest) PushToBaseRepo() (err error) {`
`1010`	`1010`	`if err = git.Push(headRepoPath, git.PushOptions{`
`1011`	`1011`	`Remote: tmpRemoteName,`
`1012`	`1012`	`Branch: fmt.Sprintf("%s:%s", pr.HeadBranch, headFile),`
	`1013`	`+ Force: true,`
`1013`	`1014`	`}); err != nil {`
`1014`	`1015`	`return fmt.Errorf("Push: %v", err)`
`1015`	`1016`	`}`