diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2011-06-07 09:38:04 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2011-06-07 09:38:04 -0700 |
| commit | 687102ed4fdb54aef2944f58f667cc693888a0a9 (patch) | |
| tree | 256832ce741bfe22bc4ace6082108589b378502c | |
| parent | f2f3b8fa99f4390b3ce0fdd921e7116228b7b5e1 (diff) | |
| download | go-687102ed4fdb54aef2944f58f667cc693888a0a9.tar.gz go-687102ed4fdb54aef2944f58f667cc693888a0a9.zip | |
gofmt: fix -d regression from exec change
Fixes #1916
R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/4590041
| -rw-r--r-- | src/cmd/gofmt/gofmt.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go index 16bcd3c4df..ea1c1b00ff 100644 --- a/src/cmd/gofmt/gofmt.go +++ b/src/cmd/gofmt/gofmt.go @@ -260,5 +260,12 @@ func diff(b1, b2 []byte) (data []byte, err os.Error) { f1.Write(b1) f2.Write(b2) - return exec.Command("diff", "-u", f1.Name(), f2.Name()).CombinedOutput() + data, err = exec.Command("diff", "-u", f1.Name(), f2.Name()).CombinedOutput() + if len(data) > 0 { + // diff exits with a non-zero status when the files don't match. + // Ignore that failure as long as we get output. + err = nil + } + return + } |