Convert plumbing.ErrObjectNotFound to git.ErrNotExist in getCommit (#…

…10862) Co-authored-by: Lauris BH <[email protected]> Co-authored-by: guillep2k <[email protected]> Co-authored-by: Antoine GIRARD <[email protected]>
go-gitea · Mar 28, 2020 · 052bff0 · 052bff0
1 parent ea67e56
commit 052bff0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
@@ -94,9 +94,15 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) {
 	gogitCommit, err := repo.gogitRepo.CommitObject(id)
 	if err == plumbing.ErrObjectNotFound {
 		tagObject, err = repo.gogitRepo.TagObject(id)
+		if err == plumbing.ErrObjectNotFound {
+			return nil, ErrNotExist{
+				ID: id.String(),
+			}
+		}
 		if err == nil {
 			gogitCommit, err = repo.gogitRepo.CommitObject(tagObject.Target)
 		}
+		// if we get a plumbing.ErrObjectNotFound here then the repository is broken and it should be 500
 	}
 	if err != nil {
 		return nil, err