aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/repo/branch.go
diff options
context:
space:
mode:
authorKN4CK3R <admin@oldschoolhack.me>2021-11-18 00:50:17 +0100
committerGitHub <noreply@github.com>2021-11-17 23:50:17 +0000
commitea42d3c04ef48b9ff0354ea196179d1a5025c04a (patch)
tree8a95df877dae7a5cf62364a525cc532205d5d188 /routers/web/repo/branch.go
parent3c4724d70e4ac7bfc06b97f6fad8936f97479b6b (diff)
downloadgitea-ea42d3c04ef48b9ff0354ea196179d1a5025c04a.tar.gz
gitea-ea42d3c04ef48b9ff0354ea196179d1a5025c04a.zip
Fixed commit count. (#17698)
Added "Tag" label. Unified branch, tag and commit name.
Diffstat (limited to 'routers/web/repo/branch.go')
-rw-r--r--routers/web/repo/branch.go12
1 files changed, 5 insertions, 7 deletions
diff --git a/routers/web/repo/branch.go b/routers/web/repo/branch.go
index 10557ff3db..27cd06023d 100644
--- a/routers/web/repo/branch.go
+++ b/routers/web/repo/branch.go
@@ -344,17 +344,15 @@ func CreateBranch(ctx *context.Context) {
var err error
if form.CreateTag {
- if ctx.Repo.IsViewTag {
- err = release_service.CreateNewTag(ctx.User, ctx.Repo.Repository, ctx.Repo.CommitID, form.NewBranchName, "")
- } else {
- err = release_service.CreateNewTag(ctx.User, ctx.Repo.Repository, ctx.Repo.BranchName, form.NewBranchName, "")
+ target := ctx.Repo.CommitID
+ if ctx.Repo.IsViewBranch {
+ target = ctx.Repo.BranchName
}
+ err = release_service.CreateNewTag(ctx.User, ctx.Repo.Repository, target, form.NewBranchName, "")
} else if ctx.Repo.IsViewBranch {
err = repo_service.CreateNewBranch(ctx.User, ctx.Repo.Repository, ctx.Repo.BranchName, form.NewBranchName)
- } else if ctx.Repo.IsViewTag {
- err = repo_service.CreateNewBranchFromCommit(ctx.User, ctx.Repo.Repository, ctx.Repo.CommitID, form.NewBranchName)
} else {
- err = repo_service.CreateNewBranchFromCommit(ctx.User, ctx.Repo.Repository, ctx.Repo.BranchName, form.NewBranchName)
+ err = repo_service.CreateNewBranchFromCommit(ctx.User, ctx.Repo.Repository, ctx.Repo.CommitID, form.NewBranchName)
}
if err != nil {
if models.IsErrTagAlreadyExists(err) {