Skip to content

Commit 6f04788

Browse files
committed
update git vendor to fix wrong release commit id and add migrations (go-gitea#6224)
* update git vendor to fix wrong release commit id and add migrations * fix count * fix migration release * fix tests
1 parent c7bbfd8 commit 6f04788

File tree

7 files changed

+44
-15
lines changed

7 files changed

+44
-15
lines changed

Gopkg.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/repo_branch.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,6 @@ func (repo *Repository) CheckBranchName(name string) error {
7070
return err
7171
}
7272

73-
if _, err := gitRepo.GetTag(name); err == nil {
74-
return ErrTagAlreadyExists{name}
75-
}
76-
7773
branches, err := repo.GetBranches()
7874
if err != nil {
7975
return err
@@ -87,6 +83,11 @@ func (repo *Repository) CheckBranchName(name string) error {
8783
return ErrBranchNameConflict{branch.Name}
8884
}
8985
}
86+
87+
if _, err := gitRepo.GetTag(name); err == nil {
88+
return ErrTagAlreadyExists{name}
89+
}
90+
9091
return nil
9192
}
9293

routers/repo/view.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
5050
}
5151
entries.CustomSort(base.NaturalSortLess)
5252

53-
ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath)
53+
ctx.Data["Files"], err = entries.GetCommitsInfo(ctx.Repo.Commit, ctx.Repo.TreePath, nil)
5454
if err != nil {
5555
ctx.ServerError("GetCommitsInfo", err)
5656
return

vendor/code.gitea.io/git/cache.go

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/commit_info.go

+15-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/repo_commit.go

+8-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/git/repo_tag.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)