Skip to content

Fix repo indexer and submodule bug #3107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 7, 2017
Merged

Fix repo indexer and submodule bug #3107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9be930b
Fix repo indexer and submodule bug
ethantkoenig Dec 7, 2017
0b60513
Merge branch 'master' into fix/repo_index_submodule
lunny Dec 7, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions models/repo_indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down