From 05f3891eb645845aa2748f5feaff4b94825d5ae4 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Wed, 21 Sep 2022 14:12:33 +0000 Subject: [PATCH] go.mod: Pin github.com/sergi/go-diff to v1.1.0 v1.2.0 has a severe bug, causing some diffs to be garbage. See https://github.com/sergi/go-diff/issues/123 Change-Id: I64d98c178db746a726a0354e699c5e50e9715d5e Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/103240 Kokoro: Kokoro Reviewed-by: Antonio Maiorano Commit-Queue: Ben Clayton --- go.mod | 6 ++++-- go.sum | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 21d9656bfe..0afc25fc9a 100644 --- a/go.mod +++ b/go.mod @@ -9,13 +9,14 @@ require ( github.com/google/go-cmp v0.5.6 github.com/mattn/go-colorable v0.1.9 github.com/mattn/go-isatty v0.0.14 - github.com/sergi/go-diff v1.2.0 + github.com/sergi/go-diff v1.1.0 github.com/shirou/gopsutil v3.21.11+incompatible github.com/tidwall/jsonc v0.3.2 go.chromium.org/luci v0.0.0-20220412023008-ab2409fe739a golang.org/x/net v0.0.0-20220403103023-749bd193bc2b golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 google.golang.org/api v0.63.0 + google.golang.org/grpc v1.44.0 google.golang.org/protobuf v1.28.0 ) @@ -44,5 +45,6 @@ require ( golang.org/x/text v0.3.7 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220216160803-4663080d8bc8 // indirect - google.golang.org/grpc v1.44.0 // indirect ) + +exclude github.com/sergi/go-diff v1.2.0 diff --git a/go.sum b/go.sum index 0b540d3577..8ac96142c3 100644 --- a/go.sum +++ b/go.sum @@ -421,8 +421,8 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=