Skip to content

Commit

Permalink
Match unqualified references when syncing pulls as well (go-gitea#23070)
Browse files Browse the repository at this point in the history
It seems that `opts.RefFullName` may occassionally be set
to just the branch name, without the `refs/heads/` prefixing.

(cherry picked from commit 7dc46ff)
  • Loading branch information
lflare authored and earl-warren committed May 30, 2023
1 parent 7f3cc14 commit 8d4d6f9
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion modules/notification/indexer/indexer.go
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

0 comments on commit 8d4d6f9

Please sign in to comment.