Fix the wrapping of some errors

Author: mhagger

git-sizer.go

@@ -191,7 +191,7 @@ func mainImplementation(args []string) error {
 	if cpuprofile != "" {
 		f, err := os.Create(cpuprofile)
 		if err != nil {
-			return fmt.Errorf("couldn't set up cpuprofile file: %s", err)
+			return fmt.Errorf("couldn't set up cpuprofile file: %w", err)
 		}
 		pprof.StartCPUProfile(f)
 		defer pprof.StopCPUProfile()
@@ -211,7 +211,7 @@ func mainImplementation(args []string) error {
 	}
 
 	if repoErr != nil {
-		return fmt.Errorf("couldn't open Git repository: %s", repoErr)
+		return fmt.Errorf("couldn't open Git repository: %w", repoErr)
 	}
 
 	if jsonOutput {
@@ -270,7 +270,7 @@ func mainImplementation(args []string) error {
 
 	historySize, err := sizes.ScanRepositoryUsingGraph(repo, rg, nameStyle, progress)
 	if err != nil {
-		return fmt.Errorf("error scanning repository: %s", err)
+		return fmt.Errorf("error scanning repository: %w", err)
 	}
 
 	if jsonOutput {
@@ -285,7 +285,7 @@ func mainImplementation(args []string) error {
 			return fmt.Errorf("JSON version must be 1 or 2")
 		}
 		if err != nil {
-			return fmt.Errorf("could not convert %v to json: %s", historySize, err)
+			return fmt.Errorf("could not convert %v to json: %w", historySize, err)
 		}
 		fmt.Printf("%s\n", j)
 	} else {

git/git.go

@@ -97,7 +97,7 @@ func NewRepository(path string) (*Repository, error) {
 	gitBin, err := findGitBin()
 	if err != nil {
 		return nil, fmt.Errorf(
-			"could not find 'git' executable (is it in your PATH?): %v", err,
+			"could not find 'git' executable (is it in your PATH?): %w", err,
 		)
 	}
 
@@ -107,7 +107,7 @@ func NewRepository(path string) (*Repository, error) {
 		switch err := err.(type) {
 		case *exec.Error:
 			return nil, fmt.Errorf(
-				"could not run '%s': %v", gitBin, err.Err,
+				"could not run '%s': %w", gitBin, err.Err,
 			)
 		case *exec.ExitError:
 			return nil, fmt.Errorf(
@@ -124,7 +124,7 @@ func NewRepository(path string) (*Repository, error) {
 	out, err = cmd.Output()
 	if err != nil {
 		return nil, fmt.Errorf(
-			"could not run 'git rev-parse --git-path shallow': %s", err,
+			"could not run 'git rev-parse --git-path shallow': %w", err,
 		)
 	}
 	shallow := smartJoin(gitDir, string(bytes.TrimSpace(out)))

sizes/output.go

@@ -262,7 +262,7 @@ func (t *Threshold) String() string {
 func (t *Threshold) Set(s string) error {
 	v, err := strconv.ParseFloat(s, 64)
 	if err != nil {
-		return fmt.Errorf("error parsing floating-point value %q: %s", s, err)
+		return fmt.Errorf("error parsing floating-point value %q: %w", s, err)
 	}
 	*t = Threshold(v)
 	return nil