From 2aa6a785cf9b066fb0a297b1bdc3fb431fa25667 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Mon, 3 Jul 2023 12:11:32 +0800 Subject: [PATCH] Make FindBranches have stable result (#25631) See the comment --- models/git/branch_list.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/models/git/branch_list.go b/models/git/branch_list.go index 836d4ffc4..131a14978 100644 --- a/models/git/branch_list.go +++ b/models/git/branch_list.go @@ -64,11 +64,6 @@ func (branches BranchList) LoadPusher(ctx context.Context) error { return nil } -const ( - BranchOrderByNameAsc = "name ASC" - BranchOrderByCommitTimeDesc = "commit_time DESC" -) - type FindBranchOptions struct { db.ListOptions RepoID int64 @@ -102,7 +97,8 @@ func orderByBranches(sess *xorm.Session, opts FindBranchOptions) *xorm.Session { } if opts.OrderBy == "" { - opts.OrderBy = BranchOrderByCommitTimeDesc + // the commit_time might be the same, so add the "name" to make sure the order is stable + opts.OrderBy = "commit_time DESC, name ASC" } return sess.OrderBy(opts.OrderBy) }