Skip to content

Fix incorrect divergence cache after switching default branch #34370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 8, 2025
Merged

Fix incorrect divergence cache after switching default branch #34370

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9902c62
Fix incorrect divergence cache after switching default branch
GWDx May 5, 2025
fa4cf91
Add integration test for divergence cache after branch switch
GWDx May 7, 2025
08c74a9
Add .branch-name for reliable selector in divergence test
GWDx May 8, 2025
705fec8
Merge branch 'main' into fix-branch-divergence
wxiaoguang May 8, 2025
c15128f
Merge branch 'main' into fix-branch-divergence
GiteaBot May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions services/repository/branch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down