chore: Enable most govet linters

.golangci.yml

@@ -51,7 +51,6 @@ linters:
   - promlinter
   - reassign
   - revive
-  - sqlclosecheck
   - staticcheck
   - stylecheck
   - tagliatelle
@@ -115,6 +114,11 @@ linters-settings:
     module-path: github.com/twpayne/chezmoi
   goimports:
     local-prefixes: github.com/twpayne/chezmoi
+  govet:
+    disable:
+    - fieldalignment
+    - shadow
+    enable-all: true
   ireturn:
     allow:
     - anon

pkg/cmd/cdcmd.go

@@ -39,23 +39,26 @@ func (c *Config) runCDCmd(cmd *cobra.Command, args []string) error {
 	var dir chezmoi.AbsPath
 	if len(args) == 0 {
 		dir = c.WorkingTreeAbsPath
-	} else if argAbsPath, err := chezmoi.NewAbsPathFromExtPath(args[0], c.homeDirAbsPath); err != nil {
-		return err
-	} else if argAbsPath == c.DestDirAbsPath {
-		dir, err = c.getSourceDirAbsPath(nil)
-		if err != nil {
-			return err
-		}
 	} else {
-		sourceState, err := c.getSourceState(cmd.Context())
-		if err != nil {
-			return err
-		}
-		sourceAbsPaths, err := c.sourceAbsPaths(sourceState, args)
-		if err != nil {
+		switch argAbsPath, err := chezmoi.NewAbsPathFromExtPath(args[0], c.homeDirAbsPath); {
+		case err != nil:
 			return err
+		case argAbsPath == c.DestDirAbsPath:
+			dir, err = c.getSourceDirAbsPath(nil)
+			if err != nil {
+				return err
+			}
+		default:
+			sourceState, err := c.getSourceState(cmd.Context())
+			if err != nil {
+				return err
+			}
+			sourceAbsPaths, err := c.sourceAbsPaths(sourceState, args)
+			if err != nil {
+				return err
+			}
+			dir = sourceAbsPaths[0]
 		}
-		dir = sourceAbsPaths[0]
 	}
 	return c.run(dir, cdCommand, cdArgs)
 }

pkg/cmd/config.go

@@ -1827,7 +1827,7 @@ func (c *Config) persistentPreRunRootE(cmd *cobra.Command, args []string) error
 			// Do nothing.
 		case err == nil:
 			return fmt.Errorf("%s: not a directory", c.SourceDirAbsPath)
-		case err != nil:
+		default:
 			return err
 		}
 	}
@@ -2205,9 +2205,6 @@ func (c *Config) targetRelPaths(
 		if err != nil {
 			return nil, err
 		}
-		if err != nil {
-			return nil, err
-		}
 		if options.mustBeInSourceState {
 			if !sourceState.Contains(targetRelPath) {
 				return nil, fmt.Errorf("%s: not in source state", arg)

pkg/cmd/keepassxctemplatefuncs.go

@@ -165,7 +165,7 @@ func keepassxcParseOutput(output []byte) (map[string]string, error) {
 		case match != nil:
 			key = match[1]
 			data[key] = match[2]
-		case match == nil && key != "":
+		case key != "":
 			data[key] += "\n" + s.Text()
 		}
 	}

pkg/cmd/updatecmd.go

@@ -74,17 +74,17 @@ func (c *Config) runUpdateCmd(cmd *cobra.Command, args []string) error {
 			return err
 		}
 	default:
-		args := []string{
+		gitArgs := []string{
 			"pull",
 			"--autostash",
 			"--rebase",
 		}
 		if c.Update.RecurseSubmodules {
-			args = append(args,
+			gitArgs = append(gitArgs,
 				"--recurse-submodules",
 			)
 		}
-		if err := c.run(c.WorkingTreeAbsPath, c.Git.Command, args); err != nil {
+		if err := c.run(c.WorkingTreeAbsPath, c.Git.Command, gitArgs); err != nil {
 			return err
 		}
 	}