aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common_test.go4
-rw-r--r--example_test.go2
-rw-r--r--plumbing/format/packfile/decoder_test.go2
-rw-r--r--plumbing/transport/server/loader.go4
-rw-r--r--remote_test.go2
-rw-r--r--repository.go4
-rw-r--r--repository_test.go4
-rw-r--r--storage/filesystem/config_test.go2
-rw-r--r--storage/filesystem/internal/dotgit/dotgit.go2
-rw-r--r--storage/filesystem/internal/dotgit/dotgit_test.go2
-rw-r--r--storage/filesystem/internal/dotgit/writers.go2
-rw-r--r--storage/filesystem/internal/dotgit/writers_test.go2
-rw-r--r--storage/filesystem/object.go2
-rw-r--r--storage/filesystem/storage.go2
-rw-r--r--storage/filesystem/storage_test.go4
-rw-r--r--worktree.go2
-rw-r--r--worktree_test.go4
17 files changed, 23 insertions, 23 deletions
diff --git a/common_test.go b/common_test.go
index 0462de2..bd60385 100644
--- a/common_test.go
+++ b/common_test.go
@@ -12,8 +12,8 @@ import (
"github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/memfs"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/memfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/example_test.go b/example_test.go
index c8731c9..abcbec7 100644
--- a/example_test.go
+++ b/example_test.go
@@ -13,7 +13,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/storage/memory"
- "gopkg.in/src-d/go-billy.v1/memfs"
+ "gopkg.in/src-d/go-billy.v2/memfs"
)
func ExampleClone() {
diff --git a/plumbing/format/packfile/decoder_test.go b/plumbing/format/packfile/decoder_test.go
index 16b0ca2..f081fd7 100644
--- a/plumbing/format/packfile/decoder_test.go
+++ b/plumbing/format/packfile/decoder_test.go
@@ -3,7 +3,7 @@ package packfile_test
import (
"io"
- "gopkg.in/src-d/go-billy.v1/memfs"
+ "gopkg.in/src-d/go-billy.v2/memfs"
"github.com/src-d/go-git-fixtures"
"gopkg.in/src-d/go-git.v4/plumbing"
diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go
index 1c21a5d..cfe9f04 100644
--- a/plumbing/transport/server/loader.go
+++ b/plumbing/transport/server/loader.go
@@ -5,8 +5,8 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/transport"
"gopkg.in/src-d/go-git.v4/storage/filesystem"
- "gopkg.in/src-d/go-billy.v1"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
// DefaultLoader is a filesystem loader ignoring host and resolving paths to /.
diff --git a/remote_test.go b/remote_test.go
index 784cfaa..2cd80cf 100644
--- a/remote_test.go
+++ b/remote_test.go
@@ -16,7 +16,7 @@ import (
"gopkg.in/src-d/go-git.v4/storage/memory"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
type RemoteSuite struct {
diff --git a/repository.go b/repository.go
index 276119c..ffb61d8 100644
--- a/repository.go
+++ b/repository.go
@@ -14,8 +14,8 @@ import (
"gopkg.in/src-d/go-git.v4/storage"
"gopkg.in/src-d/go-git.v4/storage/filesystem"
- "gopkg.in/src-d/go-billy.v1"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
var (
diff --git a/repository_test.go b/repository_test.go
index b4e085d..2503278 100644
--- a/repository_test.go
+++ b/repository_test.go
@@ -17,8 +17,8 @@ import (
"gopkg.in/src-d/go-git.v4/storage/memory"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/memfs"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/memfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
type RepositorySuite struct {
diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go
index 1757150..b2879b3 100644
--- a/storage/filesystem/config_test.go
+++ b/storage/filesystem/config_test.go
@@ -8,7 +8,7 @@ import (
"gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
type ConfigSuite struct {
diff --git a/storage/filesystem/internal/dotgit/dotgit.go b/storage/filesystem/internal/dotgit/dotgit.go
index 827269e..fdfcea7 100644
--- a/storage/filesystem/internal/dotgit/dotgit.go
+++ b/storage/filesystem/internal/dotgit/dotgit.go
@@ -12,7 +12,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing"
"gopkg.in/src-d/go-git.v4/utils/ioutil"
- "gopkg.in/src-d/go-billy.v1"
+ "gopkg.in/src-d/go-billy.v2"
)
const (
diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go
index 8c53f00..4bfae1d 100644
--- a/storage/filesystem/internal/dotgit/dotgit_test.go
+++ b/storage/filesystem/internal/dotgit/dotgit_test.go
@@ -12,7 +12,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/storage/filesystem/internal/dotgit/writers.go b/storage/filesystem/internal/dotgit/writers.go
index 13fa9bb..0d2747f 100644
--- a/storage/filesystem/internal/dotgit/writers.go
+++ b/storage/filesystem/internal/dotgit/writers.go
@@ -10,7 +10,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/format/objfile"
"gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
- "gopkg.in/src-d/go-billy.v1"
+ "gopkg.in/src-d/go-billy.v2"
)
// PackWriter is a io.Writer that generates the packfile index simultaneously,
diff --git a/storage/filesystem/internal/dotgit/writers_test.go b/storage/filesystem/internal/dotgit/writers_test.go
index cb0dc95..e7d7ef9 100644
--- a/storage/filesystem/internal/dotgit/writers_test.go
+++ b/storage/filesystem/internal/dotgit/writers_test.go
@@ -11,7 +11,7 @@ import (
"github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
func (s *SuiteDotGit) TestNewObjectPack(c *C) {
diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go
index 9381721..1518256 100644
--- a/storage/filesystem/object.go
+++ b/storage/filesystem/object.go
@@ -12,7 +12,7 @@ import (
"gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit"
"gopkg.in/src-d/go-git.v4/storage/memory"
- "gopkg.in/src-d/go-billy.v1"
+ "gopkg.in/src-d/go-billy.v2"
)
type ObjectStorage struct {
diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go
index 93da5d5..6d58006 100644
--- a/storage/filesystem/storage.go
+++ b/storage/filesystem/storage.go
@@ -4,7 +4,7 @@ package filesystem
import (
"gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit"
- "gopkg.in/src-d/go-billy.v1"
+ "gopkg.in/src-d/go-billy.v2"
)
// Storage is an implementation of git.Storer that stores data on disk in the
diff --git a/storage/filesystem/storage_test.go b/storage/filesystem/storage_test.go
index 4510657..02816f4 100644
--- a/storage/filesystem/storage_test.go
+++ b/storage/filesystem/storage_test.go
@@ -6,8 +6,8 @@ import (
"gopkg.in/src-d/go-git.v4/storage/test"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/memfs"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/memfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/worktree.go b/worktree.go
index 336f4bf..5ef2fe9 100644
--- a/worktree.go
+++ b/worktree.go
@@ -13,7 +13,7 @@ import (
"gopkg.in/src-d/go-git.v4/plumbing/format/index"
"gopkg.in/src-d/go-git.v4/plumbing/object"
- "gopkg.in/src-d/go-billy.v1"
+ "gopkg.in/src-d/go-billy.v2"
)
var ErrWorktreeNotClean = errors.New("worktree is not clean")
diff --git a/worktree_test.go b/worktree_test.go
index da2aea4..5330c67 100644
--- a/worktree_test.go
+++ b/worktree_test.go
@@ -9,8 +9,8 @@ import (
"github.com/src-d/go-git-fixtures"
. "gopkg.in/check.v1"
- "gopkg.in/src-d/go-billy.v1/memfs"
- "gopkg.in/src-d/go-billy.v1/osfs"
+ "gopkg.in/src-d/go-billy.v2/memfs"
+ "gopkg.in/src-d/go-billy.v2/osfs"
)
type WorktreeSuite struct {