diff options
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) } |