summaryrefslogtreecommitdiffstats
path: root/models/db
diff options
context:
space:
mode:
authoroliverpool <3864879+oliverpool@users.noreply.github.com>2023-04-18 21:11:17 +0200
committerGitHub <noreply@github.com>2023-04-18 21:11:17 +0200
commitbb2783860b8db033f9dcbd223a6c8b5a5c1044ac (patch)
tree3107ddfb1418ca3e2ab07041c75fe61640d18955 /models/db
parent75b9845420bb5686fc212272a4d9a07543eaced7 (diff)
downloadgitea-bb2783860b8db033f9dcbd223a6c8b5a5c1044ac.tar.gz
gitea-bb2783860b8db033f9dcbd223a6c8b5a5c1044ac.zip
fix calReleaseNumCommitsBehind (#24148)
`repoCtx.CommitsCount` is not reliably the commit count of the default branch (Repository.GetCommitsCount depends on what is currently displayed). For instance on the releases page the commit count is correct: https://codeberg.org/Codeberg/pages-server/releases ![2023-04-15-215027](https://user-images.githubusercontent.com/3864879/232250500-6c05dc00-7030-4ec9-87f1-18c7797d36bf.png) However it is not on the single page: https://codeberg.org/Codeberg/pages-server/releases/tag/v4.6.2 ![2023-04-15-215036](https://user-images.githubusercontent.com/3864879/232250503-620c8038-7c2c-45a1-b99d-cb994ef955a6.png) This PR fixes this by removing a "fast branch" which was using this field (I think this field should be removed, since it is a bit unpredictable - but this would mean a larger refactoring PR). _contributed in the context of @forgejo_ --------- Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'models/db')
-rw-r--r--models/db/iterate_test.go2
-rw-r--r--models/db/list_test.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/models/db/iterate_test.go b/models/db/iterate_test.go
index 6bcf740c23..f9f1213721 100644
--- a/models/db/iterate_test.go
+++ b/models/db/iterate_test.go
@@ -25,7 +25,7 @@ func TestIterate(t *testing.T) {
return nil
})
assert.NoError(t, err)
- assert.EqualValues(t, 84, repoCnt)
+ assert.EqualValues(t, 89, repoCnt)
err = db.Iterate(db.DefaultContext, nil, func(ctx context.Context, repoUnit *repo_model.RepoUnit) error {
reopUnit2 := repo_model.RepoUnit{ID: repoUnit.ID}
diff --git a/models/db/list_test.go b/models/db/list_test.go
index 1295692cec..195450b1e7 100644
--- a/models/db/list_test.go
+++ b/models/db/list_test.go
@@ -35,11 +35,11 @@ func TestFind(t *testing.T) {
var repoUnits []repo_model.RepoUnit
err := db.Find(db.DefaultContext, &opts, &repoUnits)
assert.NoError(t, err)
- assert.EqualValues(t, 84, len(repoUnits))
+ assert.EqualValues(t, 89, len(repoUnits))
cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit))
assert.NoError(t, err)
- assert.EqualValues(t, 84, cnt)
+ assert.EqualValues(t, 89, cnt)
repoUnits = make([]repo_model.RepoUnit, 0, 10)
newCnt, err := db.FindAndCount(db.DefaultContext, &opts, &repoUnits)