Repair LFS web rendering. (#22195)

kousu · web-flow · commit c4df10d219ad · 2022-12-21T09:21:26.000+08:00
There was just a missing check. Fixes #22193. Signed-off-by: Nick Guenther <nick.guenther@polymtl.ca>
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
@@ -272,7 +272,7 @@ func getFileReader(repoID int64, blob *git.Blob) ([]byte, io.ReadCloser, *fileIn
 	}
 
 	meta, err := git_model.GetLFSMetaObjectByOid(repoID, pointer.Oid)
-	if err != git_model.ErrLFSObjectNotExist { // fallback to plain file
+	if err != nil && err != git_model.ErrLFSObjectNotExist { // fallback to plain file
 		return buf, dataRc, &fileInfo{isTextFile, false, blob.Size(), nil, st}, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ func getFileReader(repoID int64, blob git.Blob) ([]byte, io.ReadCloser, fileIn`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`meta, err := git_model.GetLFSMetaObjectByOid(repoID, pointer.Oid)`
`275`		`- if err != git_model.ErrLFSObjectNotExist { // fallback to plain file`
	`275`	`+ if err != nil && err != git_model.ErrLFSObjectNotExist { // fallback to plain file`
`276`	`276`	`return buf, dataRc, &fileInfo{isTextFile, false, blob.Size(), nil, st}, nil`
`277`	`277`	`}`
`278`	`278`