summaryrefslogtreecommitdiffstats
path: root/models/repo_branch.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/repo_branch.go')
-rw-r--r--models/repo_branch.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/models/repo_branch.go b/models/repo_branch.go
index 88417cbd36..c4013dfb82 100644
--- a/models/repo_branch.go
+++ b/models/repo_branch.go
@@ -110,10 +110,6 @@ func (repo *Repository) CheckBranchName(name string) error {
return err
}
- if _, err := gitRepo.GetTag(name); err == nil {
- return ErrTagAlreadyExists{name}
- }
-
branches, err := repo.GetBranches()
if err != nil {
return err
@@ -127,6 +123,11 @@ func (repo *Repository) CheckBranchName(name string) error {
return ErrBranchNameConflict{branch.Name}
}
}
+
+ if _, err := gitRepo.GetTag(name); err == nil {
+ return ErrTagAlreadyExists{name}
+ }
+
return nil
}