Fix repo indexer not updating upon push (#9957)

guillep2k · zeripath · lafriks · commit dbd1fae6187b · 2020-01-24T20:00:49.000+02:00
* Fix check for push on default branch

* restart CI

Co-authored-by: zeripath &lt;art27@cantab.net&gt;
diff --git a/modules/notification/indexer/indexer.go b/modules/notification/indexer/indexer.go
@@ -6,6 +6,7 @@ package indexer
 
 import (
 	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/git"
 	code_indexer "code.gitea.io/gitea/modules/indexer/code"
 	issue_indexer "code.gitea.io/gitea/modules/indexer/issues"
 	"code.gitea.io/gitea/modules/log"
@@ -119,7 +120,7 @@ func (r *indexerNotifier) NotifyMigrateRepository(doer *models.User, u *models.U
 }
 
 func (r *indexerNotifier) NotifyPushCommits(pusher *models.User, repo *models.Repository, refName, oldCommitID, newCommitID string, commits *repository.PushCommits) {
-	if setting.Indexer.RepoIndexerEnabled && refName == repo.DefaultBranch {
+	if setting.Indexer.RepoIndexerEnabled && refName == git.BranchPrefix+repo.DefaultBranch {
 		code_indexer.UpdateRepoIndexer(repo)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ package indexer`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"code.gitea.io/gitea/models"`
	`9`	`+ "code.gitea.io/gitea/modules/git"`
`9`	`10`	`code_indexer "code.gitea.io/gitea/modules/indexer/code"`
`10`	`11`	`issue_indexer "code.gitea.io/gitea/modules/indexer/issues"`
`11`	`12`	`"code.gitea.io/gitea/modules/log"`
`@@ -119,7 +120,7 @@ func (r indexerNotifier) NotifyMigrateRepository(doer models.User, u *models.U`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`func (r indexerNotifier) NotifyPushCommits(pusher models.User, repo models.Repository, refName, oldCommitID, newCommitID string, commits repository.PushCommits) {`
`122`		`- if setting.Indexer.RepoIndexerEnabled && refName == repo.DefaultBranch {`
	`123`	`+ if setting.Indexer.RepoIndexerEnabled && refName == git.BranchPrefix+repo.DefaultBranch {`
`123`	`124`	`code_indexer.UpdateRepoIndexer(repo)`
`124`	`125`	`}`
`125`	`126`	`}`