diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/pull/merge.go | 6 | ||||
| -rw-r--r-- | services/wiki/wiki.go | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/services/pull/merge.go b/services/pull/merge.go index c8351ba85a..90b90b9c16 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -385,15 +385,13 @@ 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 strings.Contains(errbuf.String(), "non-fast-forward") { - return "", models.ErrMergePushOutOfDate{ - Style: mergeStyle, + return "", &git.ErrPushOutOfDate{ StdOut: outbuf.String(), StdErr: errbuf.String(), Err: err, } } else if strings.Contains(errbuf.String(), "! [remote rejected]") { - err := models.ErrPushRejected{ - Style: mergeStyle, + err := &git.ErrPushRejected{ StdOut: outbuf.String(), StdErr: errbuf.String(), Err: err, diff --git a/services/wiki/wiki.go b/services/wiki/wiki.go index 2ace1d7a08..3616823c5d 100644 --- a/services/wiki/wiki.go +++ b/services/wiki/wiki.go @@ -212,6 +212,9 @@ func updateWikiPage(doer *models.User, repo *models.Repository, oldWikiName, new ), }); err != nil { log.Error("%v", err) + if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) { + return err + } return fmt.Errorf("Push: %v", err) } @@ -316,6 +319,9 @@ func DeleteWikiPage(doer *models.User, repo *models.Repository, wikiName string) Branch: fmt.Sprintf("%s:%s%s", commitHash.String(), git.BranchPrefix, "master"), Env: models.PushingEnvironment(doer, repo), }); err != nil { + if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) { + return err + } return fmt.Errorf("Push: %v", err) } |