Fix #9752 (#9769) (#9775)

6543 · zeripath · sapk · commit 602c5da9530a · 2020-01-15T01:41:28.000+01:00
Co-authored-by: zeripath &lt;art27@cantab.net&gt;
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 {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func DeleteRepoFile(repo models.Repository, doer models.User, opts *DeleteRepo`
`46`	`46`	`// If we aren't branching to a new branch, make sure user can commit to the given branch`
`47`	`47`	`if opts.NewBranch != opts.OldBranch {`
`48`	`48`	`newBranch, err := repo.GetBranch(opts.NewBranch)`
`49`		`- if git.IsErrNotExist(err) {`
	`49`	`+ if err != nil && !git.IsErrBranchNotExist(err) {`
`50`	`50`	`return nil, err`
`51`	`51`	`}`
`52`	`52`	`if newBranch != nil {`