Fix #9752 (#9769) (#9775)

Co-authored-by: zeripath <art27@cantab.net>
go-gitea · Jan 15, 2020 · 602c5da · 602c5da
1 parent 1980e59
commit 602c5da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/repofiles/delete.go b/modules/repofiles/delete.go
@@ -46,7 +46,7 @@ func DeleteRepoFile(repo *models.Repository, doer *models.User, opts *DeleteRepo
  // If we aren't branching to a new branch, make sure user can commit to the given branch
  if opts.NewBranch != opts.OldBranch {
  newBranch, err := repo.GetBranch(opts.NewBranch)
- if git.IsErrNotExist(err) {
+ if err != nil && !git.IsErrBranchNotExist(err) {
  return nil, err
  }
  if newBranch != nil {