Trim whitespace from Git errors (#120)

rgmz · web-flow · commit 5d4c59c0eecb · 2024-06-05T15:09:18.000-04:00
diff --git a/providers/gitops/gitops.go b/providers/gitops/gitops.go
@@ -44,7 +44,7 @@ func (g *ExecGitCommand) Run(ctx context.Context, cmd string, args []string, dir
 	stdout, err := command.Output()
 	if err != nil {
 		if exitErr, ok := err.(*exec.ExitError); ok {
-			return nil, fmt.Errorf("command `%s` returned an error: %w stderr: %s", command.String(), err, string(exitErr.Stderr))
+			return nil, fmt.Errorf("command `%s` returned an error: %w stderr: %s", command.String(), err, string(bytes.TrimSpace(exitErr.Stderr)))
 		}
 		return nil, fmt.Errorf("error running command: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (g *ExecGitCommand) Run(ctx context.Context, cmd string, args []string, dir`
`44`	`44`	`stdout, err := command.Output()`
`45`	`45`	`if err != nil {`
`46`	`46`	`if exitErr, ok := err.(*exec.ExitError); ok {`
`47`		- return nil, fmt.Errorf("command `%s` returned an error: %w stderr: %s", command.String(), err, string(exitErr.Stderr))
	`47`	+ return nil, fmt.Errorf("command `%s` returned an error: %w stderr: %s", command.String(), err, string(bytes.TrimSpace(exitErr.Stderr)))
`48`	`48`	`}`
`49`	`49`	`return nil, fmt.Errorf("error running command: %w", err)`
`50`	`50`	`}`