diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-01-30 22:03:19 +0100 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2017-01-30 22:03:19 +0100 |
| commit | 80179adaab815eaf75099a5ff31e48c6bd07d1dc (patch) | |
| tree | 8973e44f42a5dc71054a4a45997a29103530ae17 /plumbing | |
| parent | e80d7b7267ba9f2057f259be331c4de927a60ecb (diff) | |
| download | go-git-80179adaab815eaf75099a5ff31e48c6bd07d1dc.tar.gz | |
rename billy imports
Diffstat (limited to 'plumbing')
| -rw-r--r-- | plumbing/format/packfile/decoder_test.go | 6 | ||||
| -rw-r--r-- | plumbing/transport/server/loader.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plumbing/format/packfile/decoder_test.go b/plumbing/format/packfile/decoder_test.go index 0ab5bc8..8cb5087 100644 --- a/plumbing/format/packfile/decoder_test.go +++ b/plumbing/format/packfile/decoder_test.go @@ -3,6 +3,8 @@ package packfile_test import ( "io" + "srcd.works/go-billy.v1/memfs" + "gopkg.in/src-d/go-git.v4/fixtures" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" @@ -11,8 +13,6 @@ import ( "gopkg.in/src-d/go-git.v4/storage/filesystem" "gopkg.in/src-d/go-git.v4/storage/memory" - fs "srcd.works/go-billy.v1/memory" - . "gopkg.in/check.v1" ) @@ -164,7 +164,7 @@ func (s *ReaderSuite) TestDecodeNoSeekableWithoutTxStorer(c *C) { scanner := packfile.NewScanner(reader) var storage storer.EncodedObjectStorer - storage, _ = filesystem.NewStorage(fs.New()) + storage, _ = filesystem.NewStorage(memfs.New()) _, isTxStorer := storage.(storer.Transactioner) c.Assert(isTxStorer, Equals, false) diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go index 55bcf1d..7b5770b 100644 --- a/plumbing/transport/server/loader.go +++ b/plumbing/transport/server/loader.go @@ -6,11 +6,11 @@ import ( "gopkg.in/src-d/go-git.v4/storage/filesystem" "srcd.works/go-billy.v1" - "srcd.works/go-billy.v1/os" + "srcd.works/go-billy.v1/osfs" ) // DefaultLoader is a filesystem loader ignoring host and resolving paths to /. -var DefaultLoader = NewFilesystemLoader(os.New("/")) +var DefaultLoader = NewFilesystemLoader(osfs.New("/")) // Loader loads repository's storer.Storer based on an optional host and a path. type Loader interface { |