Skip to content

Commit 38da827

Browse files
committed
use posener/diff instead of rcs.io/diff
See modules issue golang/go#31173. Fixes #28
1 parent f9828d5 commit 38da827

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

fsutil/diff.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"text/template"
1010

1111
"github.com/pkg/errors"
12-
"rsc.io/diff"
12+
"github.com/posener/diff"
1313
)
1414

1515
const (

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ require (
77
github.com/google/go-querystring v1.0.0 // indirect
88
github.com/kr/fs v0.1.0
99
github.com/pkg/errors v0.8.1
10+
github.com/posener/diff v0.0.1
1011
github.com/stretchr/testify v1.3.0
1112
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 // indirect
1213
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
1314
golang.org/x/tools v0.0.0-20190716150014-919acb9f1ffd
1415
google.golang.org/appengine v1.6.1 // indirect
1516
gopkg.in/src-d/go-billy.v4 v4.3.1
1617
gopkg.in/src-d/go-git.v4 v4.12.0
17-
rsc.io/diff v0.0.0-20190621135850-fe3479844c3c
1818
)
1919

2020
replace rsc.io/diff => github.com/posener/diff v0.0.0-20190808172948-eff7f6d9b194

go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
4444
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
4545
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4646
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
47-
github.com/posener/diff v0.0.0-20190808172948-eff7f6d9b194 h1:IucB+3+bnCm6cKa8VdXYegUWqjbE5wlcKU+BbICYmko=
48-
github.com/posener/diff v0.0.0-20190808172948-eff7f6d9b194/go.mod h1:AB6TWADCiFzYx4nzfwjeNQBxOA+FM7yLQGFe0PKx38k=
47+
github.com/posener/diff v0.0.1 h1:rjxZ4l6g5DixF+LKqFFEZpTXY2kitoiGfph/sVRjqoM=
48+
github.com/posener/diff v0.0.1/go.mod h1:hZraNYAlXkt6AyFW523B2inR/zd+gmL9WNJB45sKFzQ=
4949
github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
5050
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
5151
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
@@ -106,5 +106,3 @@ gopkg.in/src-d/go-git.v4 v4.12.0 h1:CKgvBCJCcdfNnyXPYI4Cp8PaDDAmAPEN0CtfEdEAbd8=
106106
gopkg.in/src-d/go-git.v4 v4.12.0/go.mod h1:zjlNnzc1Wjn43v3Mtii7RVxiReNP0fIu9npcXKzuNp4=
107107
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
108108
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
109-
rsc.io/diff v0.0.0-20190621135850-fe3479844c3c h1:/WCDjRGIVDjKlhtSc1PEApp2fR58gfSVK62dr/yQNyQ=
110-
rsc.io/diff v0.0.0-20190621135850-fe3479844c3c/go.mod h1:AB6TWADCiFzYx4nzfwjeNQBxOA+FM7yLQGFe0PKx38k=

0 commit comments

Comments
 (0)