qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 07:38:00 -07:00
Code Releases Activity

cmd/internal/diff: skip over Cygwin warning in diff output

Browse Source 
This happens on Windows. Don't let it stop us.

Change-Id: Ie2115d5825e1c2217f237ed373adb35594a5aaff
Reviewed-on: https://go-review.googlesource.com/c/go/+/293850
Trust: Russ Cox <rsc@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
This commit is contained in:
Russ Cox 2021-02-18 13:01:10 -05:00
parent ee7038f6a5
commit 5f2e24efb3
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cmd/internal/diff/diff.go
View File

@ -7,6 +7,7 @@
package diff package diff
import ( import (
"bytes"
exec "internal/execabs" exec "internal/execabs"
"io/ioutil" "io/ioutil"
"os" "os"
@ -38,6 +39,25 @@ func Diff(prefix string, b1, b2 []byte) ([]byte, error) {
// Ignore that failure as long as we get output. // Ignore that failure as long as we get output.
err = nil err = nil
} }
// If we are on Windows and the diff is Cygwin diff,
// machines can get into a state where every Cygwin
// command works fine but prints a useless message like:
//
// Cygwin WARNING:
// Couldn't compute FAST_CWD pointer. This typically occurs if you're using
// an older Cygwin version on a newer Windows. Please update to the latest
// available Cygwin version from https://cygwin.com/. If the problem persists,
// please see https://cygwin.com/problems.html
//
// Skip over that message and just return the actual diff.
if len(data) > 0 && !bytes.HasPrefix(data, []byte("--- ")) {
i := bytes.Index(data, []byte("\n--- "))
if i >= 0 && i < 80*10 && bytes.Contains(data[:i], []byte("://cygwin.com/")) {
data = data[i+1:]
}
}
return data, err return data, err
} }