summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models/repo_indexer.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/models/repo_indexer.go b/models/repo_indexer.go
index a6b049e081..4877d339f8 100644
--- a/models/repo_indexer.go
+++ b/models/repo_indexer.go
@@ -100,10 +100,6 @@ func populateRepoIndexer() error {
}
}
-type updateBatch struct {
- updates []indexer.RepoIndexerUpdate
-}
-
func updateRepoIndexer(repo *Repository) error {
changes, err := getRepoChanges(repo)
if err != nil {
@@ -163,6 +159,10 @@ func addUpdate(filename string, repo *Repository, batch *indexer.Batch) error {
return err
} else if stat.Size() > setting.Indexer.MaxIndexerFileSize {
return nil
+ } else if stat.IsDir() {
+ // file could actually be a directory, if it is the root of a submodule.
+ // We do not index submodule contents, so don't do anything.
+ return nil
}
fileContents, err := ioutil.ReadFile(filepath)
if err != nil {