From 8d9f8e10b10bf7c19c1609072a8cb144176ee01b Mon Sep 17 00:00:00 2001 From: Hester Gong Date: Fri, 17 Mar 2023 01:01:10 +0800 Subject: Fix tags sort by creation time (descending) on branch/tag dropdowns (#23491) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This PR fixes the tags sort issue mentioned in #23432 The tags on dropdown shoud be sorted in descending order of time but are not. Because when getting tags, it execeutes `git tag sort --sort=-taggerdate`. Git supports two types of tags: lightweight and annotated, and `git tag sort --sort=-taggerdate` dosen't work with lightweight tags, which will not give correct result. This PR add `GetTagNamesByRepoID ` to get tags from the database so the tags are sorted. Also adapt this change to the droplist when comparing branches. Dropdown places: 截屏2023-03-15 14 25 39 截屏2023-03-15 14 25 27 --- modules/context/repo.go | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'modules/context') diff --git a/modules/context/repo.go b/modules/context/repo.go index e4ac65e961..b83caf4e4b 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -660,20 +660,9 @@ func RepoAssignment(ctx *Context) (cancel context.CancelFunc) { return } - tags, err := ctx.Repo.GitRepo.GetTags(0, 0) + tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID) if err != nil { - if strings.Contains(err.Error(), "fatal: not a git repository ") { - log.Error("Repository %-v has a broken repository on the file system: %s Error: %v", ctx.Repo.Repository, ctx.Repo.Repository.RepoPath(), err) - ctx.Repo.Repository.Status = repo_model.RepositoryBroken - ctx.Repo.Repository.IsEmpty = true - ctx.Data["BranchName"] = ctx.Repo.Repository.DefaultBranch - // Only allow access to base of repo or settings - if !isHomeOrSettings { - ctx.Redirect(ctx.Repo.RepoLink) - } - return - } - ctx.ServerError("GetTags", err) + ctx.ServerError("GetTagNamesByRepoID", err) return } ctx.Data["Tags"] = tags -- cgit v1.2.3