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 /plumbing/object/merge_base_test.go | |
| parent | 2bdfd91f04068220a72feeade31defc09f2a601e (diff) | |
| download | go-git-2637279338ca9736c22b5e15fca916121ae8d089.tar.gz | |
*: migration from go-git-fixtures/v4 and go-git/gcfg
Diffstat (limited to 'plumbing/object/merge_base_test.go')
| -rw-r--r-- | plumbing/object/merge_base_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plumbing/object/merge_base_test.go b/plumbing/object/merge_base_test.go index 7d239cb..2a40f6e 100644 --- a/plumbing/object/merge_base_test.go +++ b/plumbing/object/merge_base_test.go @@ -8,8 +8,8 @@ import ( "github.com/go-git/go-git/v5/plumbing/cache" "github.com/go-git/go-git/v5/storage/filesystem" + fixtures "github.com/go-git/go-git-fixtures/v4" . "gopkg.in/check.v1" - fixtures "gopkg.in/src-d/go-git-fixtures.v3" ) func alphabeticSortCommits(commits []*Commit) { @@ -67,7 +67,6 @@ type mergeBaseSuite struct { } func (s *mergeBaseSuite) SetUpSuite(c *C) { - s.Suite.SetUpSuite(c) s.Fixture = fixtures.ByTag("merge-base").One() s.Storer = filesystem.NewStorage(s.Fixture.DotGit(), cache.NewObjectLRUDefault()) } |