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

umarcor · umarcor · commit de99a94e5e55 · 2020-05-11T16:53:58.000+02:00
diff --git a/cobra/cmd/golden_test.go b/cobra/cmd/golden_test.go
@@ -46,7 +46,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
`@@ -46,7 +46,7 @@ func compareFiles(pathA, pathB string) error {`
`46`	`46`	`// Don't execute diff if it can't be found.`
`47`	`47`	`return nil`
`48`	`48`	`}`
`49`		`- diffCmd := exec.Command(diffPath, "-u", pathA, pathB)`
	`49`	`+ diffCmd := exec.Command(diffPath, "-u", "--strip-trailing-cr", pathA, pathB)`
`50`	`50`	`diffCmd.Stdout = output`
`51`	`51`	`diffCmd.Stderr = output`
`52`	`52`