Fixes indexed repos keeping outdated indexes when files grow too large (#7731)

guillep2k · zeripath · lafriks · commit 0d1048216817 · 2019-08-03T21:42:53.000+03:00
* Fixes indexed repos keeping outdated indexes when files grow too large

Co-Authored-By: zeripath &lt;art27@cantab.net&gt;
diff --git a/models/repo_indexer.go b/models/repo_indexer.go
@@ -199,7 +199,7 @@ func addUpdate(update fileUpdate, repo *Repository, batch rupture.FlushingBatch)
 	if size, err := strconv.Atoi(strings.TrimSpace(stdout)); err != nil {
 		return fmt.Errorf("Misformatted git cat-file output: %v", err)
 	} else if int64(size) > setting.Indexer.MaxIndexerFileSize {
-		return nil
+		return addDelete(update.Filename, repo, batch)
 	}
 
 	fileContents, err := git.NewCommand("cat-file", "blob", update.BlobSha).

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ func addUpdate(update fileUpdate, repo *Repository, batch rupture.FlushingBatch)`
`199`	`199`	`if size, err := strconv.Atoi(strings.TrimSpace(stdout)); err != nil {`
`200`	`200`	`return fmt.Errorf("Misformatted git cat-file output: %v", err)`
`201`	`201`	`} else if int64(size) > setting.Indexer.MaxIndexerFileSize {`
`202`		`- return nil`
	`202`	`+ return addDelete(update.Filename, repo, batch)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`fileContents, err := git.NewCommand("cat-file", "blob", update.BlobSha).`