Fix lint

Author: lunny

modules/gitrepo/branch.go

@@ -14,11 +14,10 @@ import (
 // GetBranches returns branch names by repository
 // if limit = 0 it will not limit
 func GetBranches(ctx context.Context, repo Repository, skip, limit int) ([]string, int, error) {
-	branchNames := []string{}
-	countAll, err := curService.WalkShowRef(ctx, repo, git.TrustedCmdArgs{git.BranchPrefix, "--sort=-committerdate"}, skip, limit, func(_, branchName string) error {
+	branchNames := make([]string, 0, limit)
+	countAll, err := curService.WalkReferences(ctx, repo, git.ObjectBranch, skip, limit, func(_, branchName string) error {
 		branchName = strings.TrimPrefix(branchName, git.BranchPrefix)
 		branchNames = append(branchNames, branchName)
-
 		return nil
 	})
 	return branchNames, countAll, err

modules/gitrepo/service.go

@@ -14,7 +14,7 @@ type Service interface {
 	OpenRepository(ctx context.Context, repo Repository) (*git.Repository, error)
 	Run(ctx context.Context, c *git.Command, opts *git.RunOpts) error
 	RepoGitURL(repo Repository) string
-	WalkShowRef(ctx context.Context, repo Repository, extraArgs git.TrustedCmdArgs, skip, limit int, walkfn func(sha1, refname string) error) (countAll int, err error)
+	WalkReferences(ctx context.Context, repo Repository, refType git.ObjectType, skip, limit int, walkfn func(sha1, refname string) error) (int, error)
 }
 
 var _ Service = &localServiceImpl{}
@@ -47,6 +47,11 @@ func (s *localServiceImpl) RepoGitURL(repo Repository) string {
 	return s.absPath(repoRelativePath(repo))
 }
 
-func (s *localServiceImpl) WalkShowRef(ctx context.Context, repo Repository, extraArgs git.TrustedCmdArgs, skip, limit int, walkfn func(sha1, refname string) error) (int, error) {
-	return git.WalkShowRef(ctx, s.absPath(repoRelativePath(repo)), extraArgs, skip, limit, walkfn)
+func (s *localServiceImpl) WalkReferences(ctx context.Context, repo Repository, refType git.ObjectType, skip, limit int, walkfn func(sha1, refname string) error) (int, error) {
+	gitRepo, err := s.OpenRepository(ctx, repo)
+	if err != nil {
+		return 0, err
+	}
+	defer gitRepo.Close()
+	return gitRepo.WalkReferences(refType, skip, limit, walkfn)
 }

modules/gitrepo/walk.go

@@ -5,9 +5,11 @@ package gitrepo
 
 import (
 	"context"
+
+	"code.gitea.io/gitea/modules/git"
 )
 
 // WalkReferences walks all the references from the repository
-func WalkReferences(ctx context.Context, repo Repository, walkfn func(sha1, refname string) error) (int, error) {
-	return curService.WalkShowRef(ctx, repo, nil, 0, 0, walkfn)
+func WalkReferences(ctx context.Context, repo Repository, refType git.ObjectType, walkfn func(sha1, refname string) error) (int, error) {
+	return curService.WalkReferences(ctx, repo, refType, 0, 0, walkfn)
 }

services/repository/branch.go

@@ -254,7 +254,7 @@ func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *g
 
 // checkBranchName validates branch name with existing repository branches
 func checkBranchName(ctx context.Context, repo *repo_model.Repository, name string) error {
-	_, err := gitrepo.WalkReferences(ctx, repo, func(_, refName string) error {
+	_, err := gitrepo.WalkReferences(ctx, repo, git.ObjectBranch, func(_, refName string) error {
 		branchRefName := strings.TrimPrefix(refName, git.BranchPrefix)
 		switch {
 		case branchRefName == name: