Skip to content

Commit 7c519cb

Browse files
committed
fix lint
1 parent 9d0cee8 commit 7c519cb

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

modules/repofiles/delete.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"code.gitea.io/gitea/models"
1212
"code.gitea.io/gitea/modules/git"
13-
api "code.gitea.io/gitea/modules/structs"
1413
repo_module "code.gitea.io/gitea/modules/repository"
14+
api "code.gitea.io/gitea/modules/structs"
1515
)
1616

1717
// DeleteRepoFileOptions holds the repository delete file options

modules/repository/branch.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,21 @@ func checkBranchName(repo *models.Repository, name string) error {
4343

4444
for _, branch := range branches {
4545
if branch.Name == name {
46-
return models.ErrBranchAlreadyExists{branch.Name}
46+
return models.ErrBranchAlreadyExists{
47+
BranchName: branch.Name,
48+
}
4749
} else if (len(branch.Name) < len(name) && branch.Name+"/" == name[0:len(branch.Name)+1]) ||
4850
(len(branch.Name) > len(name) && name+"/" == branch.Name[0:len(name)+1]) {
49-
return models.ErrBranchNameConflict{branch.Name}
51+
return models.ErrBranchNameConflict{
52+
BranchName: branch.Name,
53+
}
5054
}
5155
}
5256

5357
if _, err := gitRepo.GetTag(name); err == nil {
54-
return models.ErrTagAlreadyExists{name}
58+
return models.ErrTagAlreadyExists{
59+
TagName: name,
60+
}
5561
}
5662

5763
return nil

routers/api/v1/repo/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"code.gitea.io/gitea/modules/context"
1212
"code.gitea.io/gitea/modules/convert"
1313
"code.gitea.io/gitea/modules/git"
14-
api "code.gitea.io/gitea/modules/structs"
1514
repo_module "code.gitea.io/gitea/modules/repository"
15+
api "code.gitea.io/gitea/modules/structs"
1616
)
1717

1818
// GetBranch get a branch of a repository

routers/repo/editor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919
"code.gitea.io/gitea/modules/git"
2020
"code.gitea.io/gitea/modules/log"
2121
"code.gitea.io/gitea/modules/repofiles"
22+
repo_module "code.gitea.io/gitea/modules/repository"
2223
"code.gitea.io/gitea/modules/setting"
2324
"code.gitea.io/gitea/modules/upload"
2425
"code.gitea.io/gitea/modules/util"
25-
repo_module "code.gitea.io/gitea/modules/repository"
2626
)
2727

2828
const (

0 commit comments

Comments
 (0)