Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Skip non-regular files (e.g. submodules) on repo indexing (#7711)

Browse source
This commit is contained in:
guillep2k 2019-08-02 03:57:53 -03:00 committed by zeripath
parent 0fabdf03b2
commit 06392479b4
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
models/repo_indexer.go
View file

@ -231,20 +231,28 @@ func addDelete(filename string, repo *Repository, batch rupture.FlushingBatch) e
return indexerUpdate.AddToFlushingBatch(batch) return indexerUpdate.AddToFlushingBatch(batch)
} }
func isIndexable(entry *git.TreeEntry) bool {
return entry.IsRegular()
}
// parseGitLsTreeOutput parses the output of a `git ls-tree -r --full-name` command // parseGitLsTreeOutput parses the output of a `git ls-tree -r --full-name` command
func parseGitLsTreeOutput(stdout []byte) ([]fileUpdate, error) { func parseGitLsTreeOutput(stdout []byte) ([]fileUpdate, error) {
entries, err := git.ParseTreeEntries(stdout) entries, err := git.ParseTreeEntries(stdout)
if err != nil { if err != nil {
return nil, err return nil, err
} }
var idxCount = 0
updates := make([]fileUpdate, len(entries)) updates := make([]fileUpdate, len(entries))
for i, entry := range entries { for _, entry := range entries {
updates[i] = fileUpdate{ if isIndexable(entry) {
Filename: entry.Name(), updates[idxCount] = fileUpdate{
BlobSha: entry.ID.String(), Filename: entry.Name(),
BlobSha: entry.ID.String(),
}
idxCount++
} }
} }
return updates, nil return updates[:idxCount], nil
} }
// genesisChanges get changes to add repo to the indexer for the first time // genesisChanges get changes to add repo to the indexer for the first time