From 2677d071f911fb91f382acfedaedc251bd807f70 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 14 Jan 2020 11:38:04 +0800 Subject: Move newbranch to standalone package (#9627) * Move newbranch to standalone package * move branch functions to modules to avoid dependencies cycles * fix tests * fix lint * fix lint --- modules/repofiles/delete.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/repofiles/delete.go') diff --git a/modules/repofiles/delete.go b/modules/repofiles/delete.go index 43937c49e1..f774b375a5 100644 --- a/modules/repofiles/delete.go +++ b/modules/repofiles/delete.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/git" + repo_module "code.gitea.io/gitea/modules/repository" api "code.gitea.io/gitea/modules/structs" ) @@ -37,7 +38,7 @@ func DeleteRepoFile(repo *models.Repository, doer *models.User, opts *DeleteRepo } // oldBranch must exist for this operation - if _, err := repo.GetBranch(opts.OldBranch); err != nil { + if _, err := repo_module.GetBranch(repo, opts.OldBranch); err != nil { return nil, err } @@ -45,7 +46,7 @@ func DeleteRepoFile(repo *models.Repository, doer *models.User, opts *DeleteRepo // Check to make sure the branch does not already exist, otherwise we can't proceed. // 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) + newBranch, err := repo_module.GetBranch(repo, opts.NewBranch) if git.IsErrNotExist(err) { return nil, err } -- cgit v1.2.3