fix(diff): use arg '--strip-trailing-cr' (spf13#949)

umarcor · umarcor · commit 49c5d3b3976c · 2021-11-04T04:01:05.000+01:00
diff --git a/cobra/cmd/golden_test.go b/cobra/cmd/golden_test.go
@@ -43,7 +43,7 @@ func compareFiles(pathA, pathB string) error {
 			// Don't execute diff if it can't be found.
 			return nil
 		}
-		diffCmd := exec.Command(diffPath, "-u", pathA, pathB)
+		diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB)
 		diffCmd.Stdout = output
 		diffCmd.Stderr = output
 

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func compareFiles(pathA, pathB string) error {`
`43`	`43`	`// Don't execute diff if it can't be found.`
`44`	`44`	`return nil`
`45`	`45`	`}`
`46`		`- diffCmd := exec.Command(diffPath, "-u", pathA, pathB)`
	`46`	`+ diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB)`
`47`	`47`	`diffCmd.Stdout = output`
`48`	`48`	`diffCmd.Stderr = output`
`49`	`49`