From d6a33cef23c3be2c2b5179c58ad269cd80f8d478 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Thu, 22 Apr 2021 16:35:29 +0100
Subject: [PATCH] If the default branch is not present do not report error on
stats indexing (follow-up of #15546) (#15583)
#15546 doesn't completely fix this problem because the error returned is an ObjectNotExist
error not a BranchNotExist error.
Add test for ErrObjectNotExist too
Fix #15257
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
modules/indexer/stats/db.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/indexer/stats/db.go b/modules/indexer/stats/db.go
index 3935c3ba75..976bf2d632 100644
--- a/modules/indexer/stats/db.go
+++ b/modules/indexer/stats/db.go
@@ -38,7 +38,7 @@ func (db *DBIndexer) Index(id int64) error {
// Get latest commit for default branch
commitID, err := gitRepo.GetBranchCommitID(repo.DefaultBranch)
if err != nil {
- if git.IsErrBranchNotExist(err) {
+ if git.IsErrBranchNotExist(err) || git.IsErrNotExist((err)) {
log.Debug("Unable to get commit ID for defaultbranch %s in %s ... skipping this repository", repo.DefaultBranch, repo.RepoPath())
return nil
}