Merge pull request #385 from ackama:linting/enable-nilerr

PiperOrigin-RevId: 715979832
google · Jan 15, 2025 · 3103516 · 3103516
2 parents 9a7ebb4 + 157e77f
commit 3103516
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -56,7 +56,7 @@ linters:
     - misspell
 #    - musttag
     - nakedret
-#    - nilerr
+    - nilerr
 #    - nilnil
 #    - nlreturn
 #    - noctx

diff --git a/artifact/image/whiteout/whiteout.go b/artifact/image/whiteout/whiteout.go
@@ -39,6 +39,7 @@ func Files(scalibrfs scalibrfs.FS) (map[string]struct{}, error) {
 
 	err := fs.WalkDir(scalibrfs, ".", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
+			//nolint:nilerr // continue walking if there is an error
 			return nil
 		}