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 /modules/repository/branch.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 'modules/repository/branch.go')
| -rw-r--r-- | modules/repository/branch.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/repository/branch.go b/modules/repository/branch.go index 9867aadad6..418ba25c89 100644 --- a/modules/repository/branch.go +++ b/modules/repository/branch.go @@ -109,6 +109,9 @@ func CreateNewBranch(doer *models.User, repo *models.Repository, oldBranchName, Branch: branchName, Env: models.PushingEnvironment(doer, repo), }); err != nil { + if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) { + return err + } return fmt.Errorf("Push: %v", err) } @@ -156,6 +159,9 @@ func CreateNewBranchFromCommit(doer *models.User, repo *models.Repository, commi Branch: branchName, Env: models.PushingEnvironment(doer, repo), }); err != nil { + if git.IsErrPushOutOfDate(err) || git.IsErrPushRejected(err) { + return err + } return fmt.Errorf("Push: %v", err) } |