Skip to content

Commit

Permalink
Merge pull request #881 from fabiolb/issue-873-bump-godiff-ver
Browse files Browse the repository at this point in the history 
Bump go-diff dependency version to 1.2.0.  Fixes #873
  • Loading branch information
@nathanejohnson
nathanejohnson committed Jul 8, 2022
2 parents 7075d31 + e730962 commit a262a4e
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 67 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/rakyll/statik v0.1.7
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 // indirect
github.com/rogpeppe/fastuuid v1.2.0
github.com/sergi/go-diff v1.1.0
github.com/sergi/go-diff v1.2.0
github.com/tg123/go-htpasswd v1.0.0
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
golang.org/x/net v0.0.0-20201021035429-f5854403a974
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUt
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
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/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/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down
135 changes: 71 additions & 64 deletions vendor/github.com/sergi/go-diff/diffmatchpatch/diff.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/sergi/go-diff/diffmatchpatch/patch.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions vendor/github.com/sergi/go-diff/diffmatchpatch/stringutil.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ github.com/rcrowley/go-metrics
github.com/rogpeppe/fastuuid
# github.com/ryanuber/go-glob v1.0.0
github.com/ryanuber/go-glob
# github.com/sergi/go-diff v1.1.0
# github.com/sergi/go-diff v1.2.0
github.com/sergi/go-diff/diffmatchpatch
# github.com/tg123/go-htpasswd v1.0.0
github.com/tg123/go-htpasswd
Expand Down

0 comments on commit a262a4e

Please sign in to comment.