diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 01:41:19 +0100 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 01:41:19 +0100 |
| commit | 2637279338ca9736c22b5e15fca916121ae8d089 (patch) | |
| tree | 2273e55f2d2b68b9b6335924d6b00ddf3417e8e7 /common_test.go | |
| parent | 2bdfd91f04068220a72feeade31defc09f2a601e (diff) | |
| download | go-git-2637279338ca9736c22b5e15fca916121ae8d089.tar.gz | |
*: migration from go-git-fixtures/v4 and go-git/gcfg
Diffstat (limited to 'common_test.go')
| -rw-r--r-- | common_test.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common_test.go b/common_test.go index 6d8e8d0..8154359 100644 --- a/common_test.go +++ b/common_test.go @@ -13,8 +13,8 @@ import ( "github.com/go-git/go-billy/v5" "github.com/go-git/go-billy/v5/memfs" "github.com/go-git/go-billy/v5/util" + fixtures "github.com/go-git/go-git-fixtures/v4" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git-fixtures.v3" ) func Test(t *testing.T) { TestingT(t) } @@ -28,7 +28,6 @@ type BaseSuite struct { } func (s *BaseSuite) SetUpSuite(c *C) { - s.Suite.SetUpSuite(c) s.buildBasicRepository(c) s.cache = make(map[string]*Repository) @@ -99,7 +98,7 @@ func (s *BaseSuite) NewRepositoryWithEmptyWorktree(f *fixtures.Fixture) *Reposit } func (s *BaseSuite) NewRepositoryFromPackfile(f *fixtures.Fixture) *Repository { - h := f.PackfileHash.String() + h := f.PackfileHash if r, ok := s.cache[h]; ok { return r } @@ -112,7 +111,7 @@ func (s *BaseSuite) NewRepositoryFromPackfile(f *fixtures.Fixture) *Repository { panic(err) } - storer.SetReference(plumbing.NewHashReference(plumbing.HEAD, f.Head)) + storer.SetReference(plumbing.NewHashReference(plumbing.HEAD, plumbing.NewHash(f.Head))) r, err := Open(storer, memfs.New()) if err != nil { |