Skip non-regular files (e.g. submodules) on repo indexing (#7711)
This commit is contained in:
parent
0fabdf03b2
commit
06392479b4
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue