Skip to content

Match unqualified references when syncing pulls as well #23070

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 2 commits into from
May 29, 2023
Merged

Match unqualified references when syncing pulls as well #23070

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0f9c8a
Attempt to resolve #15367
lflare Feb 22, 2023
2d15ea4
Merge branch 'release/v1.19' into fix/15367-mirror-indexer-update
GiteaBot May 29, 2023
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
14 changes: 13 additions & 1 deletion modules/notification/indexer/indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,19 @@ func (r *indexerNotifier) NotifyPushCommits(ctx context.Context, pusher *user_mo
}

func (r *indexerNotifier) NotifySyncPushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
if setting.Indexer.RepoIndexerEnabled && opts.RefFullName == git.BranchPrefix+repo.DefaultBranch {
// opts.RefFullName may occasionally be set to just the branch name, like 'master', without
// the preceding 'refs/heads/` text, hence we match for both with and without the branch
// prefix
// e.g.
// remote: Enumerating objects: 1544, done.
// remote: Counting objects: 100% (1154/1154), done.
// remote: Compressing objects: 100% (155/155), done.
// remote: Total 1544 (delta 1022), reused 1078 (delta 996), pack-reused 390
// Receiving objects: 100% (1544/1544), 2.16 MiB | 13.15 MiB/s, done.
// Resolving deltas: 100% (1092/1092), completed with 439 local objects.
// From https://github.com/go-gitea/gitea
// 698188530..cf1a7b08e main -> origin/main
if setting.Indexer.RepoIndexerEnabled && (opts.RefFullName == git.BranchPrefix+repo.DefaultBranch || opts.RefFullName == repo.DefaultBranch) {
code_indexer.UpdateRepoIndexer(repo)
}
if err := stats_indexer.UpdateRepoIndexer(repo); err != nil {
Expand Down