summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-03-28 04:13:18 +0000
committerGitHub <noreply@github.com>2020-03-28 01:13:18 -0300
commit7cd47046ea6e1fde2c88290a42f345795aee0ea4 (patch)
tree6004084e3c478a68a47b47deb0143a2b142fb821 /services
parentcac30abefc02e36ed08810b7101b4f6a7c8bb599 (diff)
downloadgitea-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')
-rw-r--r--services/pull/merge.go6
-rw-r--r--services/wiki/wiki.go6
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)
}