From 6093e82cc4df360b4c13c5f5d499bb8cdb547d45 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Sat, 3 Aug 2019 15:04:58 -0300 Subject: [PATCH 1/2] Fixes indexed repos keeping outdated indexes when files grow too large --- models/repo_indexer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo_indexer.go b/models/repo_indexer.go index 3a41e0525ac3b..dbd6c0fcc4267 100644 --- 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 + addDelete(update.Filename, repo, batch) } fileContents, err := git.NewCommand("cat-file", "blob", update.BlobSha). From e9a15a7b7d0ab32b0a356ae71fc202cbe7dfee9f Mon Sep 17 00:00:00 2001 From: guillep2k Date: Sat, 3 Aug 2019 15:16:35 -0300 Subject: [PATCH 2/2] =?UTF-8?q?It=20certainly=20should=20=F0=9F=98=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: zeripath --- models/repo_indexer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/repo_indexer.go b/models/repo_indexer.go index dbd6c0fcc4267..c991b1aac9706 100644 --- 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 { - addDelete(update.Filename, repo, batch) + return addDelete(update.Filename, repo, batch) } fileContents, err := git.NewCommand("cat-file", "blob", update.BlobSha).