Skip to content

Commit

Permalink
Update vendored fsutil fork
Browse files Browse the repository at this point in the history 
Signed-off-by: Aaron Lehmann <[email protected]>
  • Loading branch information
@aaronlehmann
aaronlehmann committed Apr 28, 2021
1 parent 73c0496 commit e118757
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 60 deletions.
2 changes: 1 addition & 1 deletion cache/contenthash/checksum.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func shouldIncludePath(
lastIncludedDir string,
) (bool, bool, error) {
if wildcard {
include, err := path.Match(p, candidate)
include, err := path.Match(p, candidate, true)
if err != nil {
return include, false, err
}
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ replace (
github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
// temporary until https://github.com/tonistiigi/fsutil/pull/101 is merged
github.com/tonistiigi/fsutil => github.com/aaronlehmann/fsutil v0.0.0-20210421230417-620ac87d5620
github.com/tonistiigi/fsutil => github.com/aaronlehmann/fsutil v0.0.0-20210428220603-accc0fae8749
// genproto: corresponds to containerd
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
// grpc: corresponds to protobuf
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
github.com/aaronlehmann/fsutil v0.0.0-20210421230417-620ac87d5620 h1:QvaYmkJ1bcslW9/y3HXoe96Pz51pr3Hg55DhskwauZE=
github.com/aaronlehmann/fsutil v0.0.0-20210421230417-620ac87d5620/go.mod h1:4Bcxev2PKmz1bFF6Mg3opy8w4kYQVvEXQGKVkQkP2Ac=
github.com/aaronlehmann/fsutil v0.0.0-20210428220603-accc0fae8749 h1:Pe6Ex38zK9fsv73pYe5c3/pf2ZNKIHxlw4VMt2hbpl8=
github.com/aaronlehmann/fsutil v0.0.0-20210428220603-accc0fae8749/go.mod h1:4Bcxev2PKmz1bFF6Mg3opy8w4kYQVvEXQGKVkQkP2Ac=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
Expand Down
99 changes: 50 additions & 49 deletions vendor/github.com/tonistiigi/fsutil/copy/copy.go
View file

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

20 changes: 15 additions & 5 deletions vendor/github.com/tonistiigi/fsutil/prefix/match.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/tonistiigi/fsutil/walker.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 @@ -325,7 +325,7 @@ github.com/sirupsen/logrus
# github.com/stretchr/testify v1.7.0
github.com/stretchr/testify/assert
github.com/stretchr/testify/require
# github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85 => github.com/aaronlehmann/fsutil v0.0.0-20210421230417-620ac87d5620
# github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85 => github.com/aaronlehmann/fsutil v0.0.0-20210428220603-accc0fae8749
github.com/tonistiigi/fsutil
github.com/tonistiigi/fsutil/copy
github.com/tonistiigi/fsutil/prefix
Expand Down

0 comments on commit e118757

Please sign in to comment.