Fix #9752 (#9769)

zeripath · web-flow · commit d171cd41b178 · 2020-01-14T23:11:08.000Z
diff --git a/modules/repofiles/delete.go b/modules/repofiles/delete.go
@@ -47,7 +47,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_module.GetBranch(repo, 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
`@@ -47,7 +47,7 @@ func DeleteRepoFile(repo models.Repository, doer models.User, opts *DeleteRepo`
`47`	`47`	`// If we aren't branching to a new branch, make sure user can commit to the given branch`
`48`	`48`	`if opts.NewBranch != opts.OldBranch {`
`49`	`49`	`newBranch, err := repo_module.GetBranch(repo, opts.NewBranch)`
`50`		`- if git.IsErrNotExist(err) {`
	`50`	`+ if err != nil && !git.IsErrBranchNotExist(err) {`
`51`	`51`	`return nil, err`
`52`	`52`	`}`
`53`	`53`	`if newBranch != nil {`