Base diff colorization on stdout not stderr. Fixes #246

geofffranks · Feb 6, 2018 · 169660d · 169660d
1 parent 6e73c52
commit 169660d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ci/release_notes.md b/ci/release_notes.md
@@ -0,0 +1,8 @@
+#Bug Fixes
+
+- `spruce diff` output used to be colorized based on whether or not STDERR was 
+  sent to a terminal. This led to issues piping or redirecting the actual diff output,
+  so now the decision is based on what type of device STDOUT is. All other `spruce`
+  subcommands are unaffected, and continue to colorize based on STDERR's device type.
+
+  Thanks @giner for pointing this out!
diff --git a/cmd/spruce/main.go b/cmd/spruce/main.go
@@ -164,6 +164,7 @@ func main() {
 		}
 
 	case "diff":
+		ansi.Color(isatty.IsTerminal(os.Stdout.Fd()))
 		if len(options.Diff.Files) != 2 {
 			usage()
 			return
-Original file line number
+Diff line change
@@ Expand Up / @@ -164,6 +164,7 @@ func main() { @@
     		}
     	case "diff":
+    		ansi.Color(isatty.IsTerminal(os.Stdout.Fd()))
     		if len(options.Diff.Files) != 2 {
     			usage()
     			return
@@ Expand Down @@