mirror of
https://github.com/go-gitea/gitea
synced 2024-12-24 17:44:27 +00:00
Backport #31659 by @Zettat123 Fix #31599 Fix #31472 A branch divergence is counted based on the default branch. If the default branch is updated, all divergence caches of the repo need to be deleted. Co-authored-by: Zettat123 <zettat123@gmail.com>
This commit is contained in:
parent
c2b1b94c5a
commit
00aade2cab
@ -147,6 +147,23 @@ func DelDivergenceFromCache(repoID int64, branchName string) error {
|
||||
return cache.GetCache().Delete(getDivergenceCacheKey(repoID, branchName))
|
||||
}
|
||||
|
||||
// DelRepoDivergenceFromCache deletes all divergence caches of a repository
|
||||
func DelRepoDivergenceFromCache(ctx context.Context, repoID int64) error {
|
||||
dbBranches, err := db.Find[git_model.Branch](ctx, git_model.FindBranchOptions{
|
||||
RepoID: repoID,
|
||||
ListOptions: db.ListOptionsAll,
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for i := range dbBranches {
|
||||
if err := DelDivergenceFromCache(repoID, dbBranches[i].Name); err != nil {
|
||||
log.Error("DelDivergenceFromCache: %v", err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func loadOneBranch(ctx context.Context, repo *repo_model.Repository, dbBranch *git_model.Branch, protectedBranches *git_model.ProtectedBranchRules,
|
||||
repoIDToRepo map[int64]*repo_model.Repository,
|
||||
repoIDToGitRepo map[int64]*git.Repository,
|
||||
|
@ -221,8 +221,14 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
|
||||
}
|
||||
|
||||
// delete cache for divergence
|
||||
if err := DelDivergenceFromCache(repo.ID, branch); err != nil {
|
||||
log.Error("DelDivergenceFromCache: %v", err)
|
||||
if branch == repo.DefaultBranch {
|
||||
if err := DelRepoDivergenceFromCache(ctx, repo.ID); err != nil {
|
||||
log.Error("DelRepoDivergenceFromCache: %v", err)
|
||||
}
|
||||
} else {
|
||||
if err := DelDivergenceFromCache(repo.ID, branch); err != nil {
|
||||
log.Error("DelDivergenceFromCache: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
commits := repo_module.GitToPushCommits(l)
|
||||
|
Loading…
Reference in New Issue
Block a user