Add background cron task to fix wrong branch commit count information

Author: lunny

models/git/branch.go

@@ -255,7 +255,7 @@ func UpdateBranch(ctx context.Context, repoID, pusherID int64, branchName string
 
 func UpdateBranchCommitCount(ctx context.Context, repoID int64, branchName, commitID string, commitCount int64) error {
 	_, err := db.GetEngine(ctx).Where("repo_id=? AND name=?", repoID, branchName).
-		Cols("commit_count").
+		Cols("commit_count", "commit_count_id").
 		Update(&Branch{
 			CommitCount:   commitCount,
 			CommitCountID: commitID,

models/git/branch_list.go

@@ -146,3 +146,20 @@ func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64
 	}
 	return branchMap, nil
 }
+
+func FindCommitsCountOutdatedBranches(ctx context.Context, startID, limit int64) (BranchList, error) {
+	var branches BranchList
+	if err := db.GetEngine(ctx).
+		Join("INNER", "repository", "branch.repo_id = repository.id").
+		And("repository.is_empty = ?", false).
+		Where("id > ?", startID).
+		And(
+			builder.Expr("commit_count_id IS NULL").
+				Or(builder.Expr("commit_id <> commit_count_id")),
+		).
+		Asc("id").
+		Limit(int(limit)).Find(&branches); err != nil {
+		return nil, err
+	}
+	return branches, nil
+}

modules/gitrepo/commit.go

@@ -0,0 +1,26 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package gitrepo
+
+import (
+	"context"
+
+	"code.gitea.io/gitea/modules/git"
+)
+
+func GetCommit(ctx context.Context, repo Repository, commitID string) (*git.Commit, error) {
+	gitRepo, err := git.OpenRepository(ctx, repoPath(repo))
+	if err != nil {
+		return nil, err
+	}
+	defer gitRepo.Close()
+	return gitRepo.GetCommit(commitID)
+}
+
+func CommitsCount(ctx context.Context, repo Repository, ref string) (int64, error) {
+	return git.CommitsCount(ctx, git.CommitsCountOptions{
+		RepoPath: repoPath(repo),
+		Revision: []string{ref},
+	})
+}

options/locale/locale_en-US.ini

@@ -3016,6 +3016,7 @@ dashboard.sync_branch.started = Branches Sync started
 dashboard.sync_tag.started = Tags Sync started
 dashboard.rebuild_issue_indexer = Rebuild issue indexer
 dashboard.sync_repo_licenses = Sync repo licenses
+dashboard.sync_branch_commits_count = Sync Branch commits counts
 
 users.user_manage_panel = User Account Management
 users.new_account = Create User Account

services/repository/branch.go

@@ -738,6 +738,7 @@ func GetBranchDivergingInfo(ctx reqctx.RequestContext, baseRepo *repo_model.Repo
 }
 
 func SyncBranchCommitsCount(ctx context.Context) error {
+	startID := int64(0)
 	for {
 		select {
 		case <-ctx.Done():
@@ -746,8 +747,22 @@ func SyncBranchCommitsCount(ctx context.Context) error {
 		}
 
 		// search all branches commits count are not synced
+		branches, err := git_model.FindCommitsCountOutdatedBranches(ctx, startID, 100)
+		if err != nil {
+			return err
+		}
+		if len(branches) == 0 {
+			return nil
+		}
+
+		if err := branches.LoadRepo(ctx); err != nil {
+			return err
+		}
 
 		for _, branch := range branches {
+			if branch.ID > startID {
+				startID = branch.ID
+			}
 			if err := syncBranchCommitsCount(ctx, branch); err != nil {
 				log.Error("syncBranchCommitsCount: %v", err)
 			}
@@ -756,27 +771,14 @@ func SyncBranchCommitsCount(ctx context.Context) error {
 }
 
 func syncBranchCommitsCount(ctx context.Context, branch *git_model.Branch) error {
-	if err := branch.LoadRepo(ctx); err != nil {
-		return err
-	}
-	commitID, err := gitrepo.GetBranchCommitID(ctx, branch.Repo, branch.Name)
-	if err != nil {
-		return err
-	}
-
-	var cols []string
-	if commitID != branch.CommitID {
-		branch.CommitID = commitID
-		cols = append(cols, "commit_id")
+	if branch.CommitID == "" {
+		return nil
 	}
 
-	commit, err := gitrepo.GetCommit(ctx, branch.Repo, commitID)
-
-	commitsCount, err := commit.CommitsCount()
+	commitsCount, err := gitrepo.CommitsCount(ctx, branch.Repo, branch.CommitID)
 	if err != nil {
 		return err
 	}
 
-	git_model.UpdateBranchCommitCount(ctx, branch.RepoID, branch.Name, commit.ID, commitsCount)
-	return nil
+	return git_model.UpdateBranchCommitCount(ctx, branch.RepoID, branch.Name, branch.CommitID, commitsCount)
 }

services/repository/push.go

@@ -302,7 +302,7 @@ func UpdateRepoBranchCommitsCount(ctx context.Context, repo *repo_model.Reposito
 	if err != nil {
 		return fmt.Errorf("newCommit.CommitsCount: %w", err)
 	}
-	return git_model.UpdateBranchCommitCount(ctx, repo.ID, branch, commitsCount)
+	return git_model.UpdateBranchCommitCount(ctx, repo.ID, branch, newCommit.ID.String(), commitsCount)
 }
 
 func pushUpdateBranch(ctx context.Context, repo *repo_model.Repository, pusher *user_model.User, opts *repo_module.PushUpdateOptions, newCommit *git.Commit) ([]*git.Commit, error) {