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/repofiles/update.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/repofiles/update.go')
| -rw-r--r-- | modules/repofiles/update.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/repofiles/update.go b/modules/repofiles/update.go index 86f53d4a1c..d65f61c840 100644 --- a/modules/repofiles/update.go +++ b/modules/repofiles/update.go @@ -446,6 +446,7 @@ func CreateOrUpdateRepoFile(repo *models.Repository, doer *models.User, opts *Up // Then push this tree to NewBranch if err := t.Push(doer, commitHash, opts.NewBranch); err != nil { + log.Error("%T %v", err, err) return nil, err } |