diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-11-24 09:49:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-24 09:49:05 +0100 |
| commit | be7a64e40de9cf2b2590bf4b62b2f9169f5f9302 (patch) | |
| tree | 239e82702d6448db8de5be6219c30422fdb4b387 /utils/merkletrie | |
| parent | d9518b57cdc9701c0077d23db54558f496daea9f (diff) | |
| parent | caa4dc4729e50e3a10ccd438d02d69fa20f9b766 (diff) | |
| download | go-git-be7a64e40de9cf2b2590bf4b62b2f9169f5f9302.tar.gz | |
Merge pull request #655 from mcuadros/billy.v4
*: update to go-billy.v4 and go-git-fixtures.v3
Diffstat (limited to 'utils/merkletrie')
| -rw-r--r-- | utils/merkletrie/filesystem/node.go | 3 | ||||
| -rw-r--r-- | utils/merkletrie/filesystem/node_test.go | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go index 42a58a3..12d0018 100644 --- a/utils/merkletrie/filesystem/node.go +++ b/utils/merkletrie/filesystem/node.go @@ -5,10 +5,11 @@ import ( "os" "path" - "gopkg.in/src-d/go-billy.v3" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/filemode" "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + + "gopkg.in/src-d/go-billy.v4" ) var ignore = map[string]bool{ diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go index 7aa0d97..12f3412 100644 --- a/utils/merkletrie/filesystem/node_test.go +++ b/utils/merkletrie/filesystem/node_test.go @@ -8,8 +8,8 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v3" - "gopkg.in/src-d/go-billy.v3/memfs" + "gopkg.in/src-d/go-billy.v4" + "gopkg.in/src-d/go-billy.v4/memfs" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/utils/merkletrie" "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" |