diff options
| author | zeripath <art27@cantab.net> | 2020-03-28 04:13:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-28 01:13:18 -0300 |
| commit | 7cd47046ea6e1fde2c88290a42f345795aee0ea4 (patch) | |
| tree | 6004084e3c478a68a47b47deb0143a2b142fb821 /services/pull/merge.go | |
| parent | cac30abefc02e36ed08810b7101b4f6a7c8bb599 (diff) | |
| download | gitea-7cd47046ea6e1fde2c88290a42f345795aee0ea4.tar.gz gitea-7cd47046ea6e1fde2c88290a42f345795aee0ea4.zip | |
Handle push rejection in branch and upload (#10854)
* Handle push rejections and push out-of-date in branch creation and
file upload.
* Remove the duplicated sanitize from services/pull/merge
* Move the errors Err(Merge)PushOutOfDate and ErrPushRejected to
modules/git
* Handle errors better in the upload file dialogs
Fix #10460
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Diffstat (limited to 'services/pull/merge.go')
| -rw-r--r-- | services/pull/merge.go | 6 |
1 files changed, 2 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, |