Merge branch 'main' into gomoddeps

fatih · Dec 9, 2024 · 388ba0c · 388ba0c
2 parents be536a2 + c0a3576
commit 388ba0c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/color.go b/color.go
@@ -235,10 +235,6 @@ func (c *Color) UnsetWriter(w io.Writer) {
 		return
 	}
 
-	if NoColor {
-		return
-	}
-
 	fmt.Fprintf(w, "%s[%dm", escape, Reset)
 }
 

diff --git a/go.mod b/go.mod
@@ -5,5 +5,5 @@ go 1.17
 require (
 	github.com/mattn/go-colorable v0.1.13
 	github.com/mattn/go-isatty v0.0.20
-	golang.org/x/sys v0.25.0
+	golang.org/x/sys v0.28.0
 )
diff --git a/go.sum b/go.sum
@@ -5,5 +5,5 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
-golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-Original file line number
+Diff line change
@@ Expand Up / @@ -235,10 +235,6 @@ func (c *Color) UnsetWriter(w io.Writer) { @@
     		return
     	}
-    	if NoColor {
-    		return
-    	}
     	fmt.Fprintf(w, "%s[%dm", escape, Reset)
     }
@@ Expand Down @@