Merge branch 'master' into lunny/refactor_push_update

6543 · web-flow · commit 09fd01f6ebc0 · 2020-12-08T01:47:49.000Z
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -411,7 +411,7 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge
 	)
 
 	// Push back to upstream.
-	if err := git.NewCommand("push", "origin", baseBranch+":"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
+	if err := git.NewCommand("push", "origin", baseBranch+":refs/heads/"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
 		if strings.Contains(errbuf.String(), "non-fast-forward") {
 			return "", &git.ErrPushOutOfDate{
 				StdOut: outbuf.String(),

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ func rawMerge(pr models.PullRequest, doer models.User, mergeStyle models.Merge`
`411`	`411`	`)`
`412`	`412`
`413`	`413`	`// Push back to upstream.`
`414`		`- if err := git.NewCommand("push", "origin", baseBranch+":"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {`
	`414`	`+ if err := git.NewCommand("push", "origin", baseBranch+":refs/heads/"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {`
`415`	`415`	`if strings.Contains(errbuf.String(), "non-fast-forward") {`
`416`	`416`	`return "", &git.ErrPushOutOfDate{`
`417`	`417`	`StdOut: outbuf.String(),`