coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix repo indexer and submodule bug (#3107)

This commit is contained in:
Ethan Koenig 2017-12-06 23:18:04 -08:00 committed by Lunny Xiao
parent 311c83ad17
commit 5e4427e4e7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/repo_indexer.go
View File

@ -100,10 +100,6 @@ func populateRepoIndexer() error {
} }
} }
type updateBatch struct {
updates []indexer.RepoIndexerUpdate
}
func updateRepoIndexer(repo *Repository) error { func updateRepoIndexer(repo *Repository) error {
changes, err := getRepoChanges(repo) changes, err := getRepoChanges(repo)
if err != nil { if err != nil {
@ -163,6 +159,10 @@ func addUpdate(filename string, repo *Repository, batch *indexer.Batch) error {
return err return err
} else if stat.Size() > setting.Indexer.MaxIndexerFileSize { } else if stat.Size() > setting.Indexer.MaxIndexerFileSize {
return nil 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) fileContents, err := ioutil.ReadFile(filepath)
if err != nil { if err != nil {