Fix incorrect divergence cache after switching default branch

GWDx · GWDx · commit 9902c62f9919 · 2025-05-05T11:40:40.000+08:00
Issue: After switching the default branch, other branches are still compared against the old default branch due to outdated divergence cache. Change: Clear the divergence cache in SetRepoDefaultBranch to ensure correct comparisons against the new default branch. Fixes #34369
diff --git a/services/repository/branch.go b/services/repository/branch.go
@@ -663,6 +663,11 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, newB
 		}
 	}
 
+	// clear divergence cache
+	if err := DelRepoDivergenceFromCache(ctx, repo.ID); err != nil {
+		log.Error("DelRepoDivergenceFromCache: %v", err)
+	}
+
 	notify_service.ChangeDefaultBranch(ctx, repo)
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -663,6 +663,11 @@ func SetRepoDefaultBranch(ctx context.Context, repo *repo_model.Repository, newB`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`
	`666`	`+ // clear divergence cache`
	`667`	`+ if err := DelRepoDivergenceFromCache(ctx, repo.ID); err != nil {`
	`668`	`+ log.Error("DelRepoDivergenceFromCache: %v", err)`
	`669`	`+ }`
	`670`	`+`
`666`	`671`	`notify_service.ChangeDefaultBranch(ctx, repo)`
`667`	`672`
`668`	`673`	`return nil`