Merge 6c6dceade3 into 228b35f074

Tiny wording clarification in `restic-stats.1`.

cmd/restic/cmd_repair_packs.go

@@ -82,6 +82,10 @@ func runRepairPacks(ctx context.Context, gopts GlobalOptions, term *termstatus.T
 			return err
 		})
 		if err != nil {
+			_ = f.Close()
+			return err
+		}
+		if err := f.Close(); err != nil {
 			return err
 		}
 	}

cmd/restic/cmd_stats.go

@@ -38,7 +38,7 @@ depending on what you are trying to calculate.
 The modes are:
 
 * restore-size: (default) Counts the size of the restored files.
-* files-by-contents: Counts total size of files, where a file is
+* files-by-contents: Counts total size of unique files, where a file is
    considered unique if it has unique contents.
 * raw-data: Counts the size of blobs in the repository, regardless of
   how many files reference them.

internal/fs/vss_windows.go

@@ -190,7 +190,7 @@ func (e *vssError) Error() string {
 	return fmt.Sprintf("VSS error: %s: %s (%#x)", e.text, e.hresult.Str(), e.hresult)
 }
 
-// VssError encapsulates errors returned from calling VSS api.
+// vssTextError encapsulates errors returned from calling VSS api.
 type vssTextError struct {
 	text string
 }

internal/walker/walker_test.go

@@ -13,7 +13,7 @@ import (
 // TestTree is used to construct a list of trees for testing the walker.
 type TestTree map[string]interface{}
 
-// TestNode is used to test the walker.
+// TestFile is used to test the walker.
 type TestFile struct {
 	Size uint64
 }