diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 00:40:56 +0100 |
---|---|---|
committer | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 00:40:56 +0100 |
commit | 2bdfd91f04068220a72feeade31defc09f2a601e (patch) | |
tree | eb3096d97addee6d5a95538a90d37fe4146312e3 /plumbing/object | |
parent | 042981be1fc9aa9b182c3c35b7e2258845e13f49 (diff) | |
download | go-git-2bdfd91f04068220a72feeade31defc09f2a601e.tar.gz |
*: migration from gopkg to go modules
Diffstat (limited to 'plumbing/object')
37 files changed, 122 insertions, 122 deletions
diff --git a/plumbing/object/blob.go b/plumbing/object/blob.go index f376baa..8fb7576 100644 --- a/plumbing/object/blob.go +++ b/plumbing/object/blob.go @@ -3,9 +3,9 @@ package object import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/utils/ioutil" ) // Blob is used to store arbitrary data - it is generally a file. diff --git a/plumbing/object/blob_test.go b/plumbing/object/blob_test.go index 181436d..4461343 100644 --- a/plumbing/object/blob_test.go +++ b/plumbing/object/blob_test.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" ) diff --git a/plumbing/object/change.go b/plumbing/object/change.go index a1b4c27..4474905 100644 --- a/plumbing/object/change.go +++ b/plumbing/object/change.go @@ -6,7 +6,7 @@ import ( "fmt" "strings" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie" ) // Change values represent a detected change between two git trees. For diff --git a/plumbing/object/change_adaptor.go b/plumbing/object/change_adaptor.go index 491c399..f701188 100644 --- a/plumbing/object/change_adaptor.go +++ b/plumbing/object/change_adaptor.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // The following functions transform changes types form the merkletrie diff --git a/plumbing/object/change_adaptor_test.go b/plumbing/object/change_adaptor_test.go index c7c003b..6b718ff 100644 --- a/plumbing/object/change_adaptor_test.go +++ b/plumbing/object/change_adaptor_test.go @@ -3,13 +3,13 @@ package object import ( "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/change_test.go b/plumbing/object/change_test.go index e2f0a23..357cb67 100644 --- a/plumbing/object/change_test.go +++ b/plumbing/object/change_test.go @@ -4,13 +4,13 @@ import ( "context" "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/format/diff" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/format/diff" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/utils/merkletrie" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/commit.go b/plumbing/object/commit.go index eb86a01..b37ff61 100644 --- a/plumbing/object/commit.go +++ b/plumbing/object/commit.go @@ -11,9 +11,9 @@ import ( "golang.org/x/crypto/openpgp" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/utils/ioutil" ) const ( diff --git a/plumbing/object/commit_stats_test.go b/plumbing/object/commit_stats_test.go index dc9e4ad..953a9cb 100644 --- a/plumbing/object/commit_stats_test.go +++ b/plumbing/object/commit_stats_test.go @@ -4,14 +4,14 @@ import ( "context" "time" - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/storage/memory" + "github.com/go-git/go-billy/v5/memfs" + "github.com/go-git/go-billy/v5/util" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-billy.v4/util" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/plumbing/object/commit_test.go b/plumbing/object/commit_test.go index 957e7d6..d56d812 100644 --- a/plumbing/object/commit_test.go +++ b/plumbing/object/commit_test.go @@ -9,11 +9,11 @@ import ( "time" fixtures "gopkg.in/src-d/go-git-fixtures.v3" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/storage/filesystem" ) type SuiteCommit struct { diff --git a/plumbing/object/commit_walker.go b/plumbing/object/commit_walker.go index 0eff059..a96b6a4 100644 --- a/plumbing/object/commit_walker.go +++ b/plumbing/object/commit_walker.go @@ -4,9 +4,9 @@ import ( "container/list" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" ) type commitPreIterator struct { diff --git a/plumbing/object/commit_walker_bfs.go b/plumbing/object/commit_walker_bfs.go index dabfe75..8047fa9 100644 --- a/plumbing/object/commit_walker_bfs.go +++ b/plumbing/object/commit_walker_bfs.go @@ -3,8 +3,8 @@ package object import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) type bfsCommitIterator struct { diff --git a/plumbing/object/commit_walker_bfs_filtered.go b/plumbing/object/commit_walker_bfs_filtered.go index 7b17f15..e87c3db 100644 --- a/plumbing/object/commit_walker_bfs_filtered.go +++ b/plumbing/object/commit_walker_bfs_filtered.go @@ -3,8 +3,8 @@ package object import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) // NewFilterCommitIter returns a CommitIter that walks the commit history, diff --git a/plumbing/object/commit_walker_bfs_filtered_test.go b/plumbing/object/commit_walker_bfs_filtered_test.go index 6984b60..b7ee0bb 100644 --- a/plumbing/object/commit_walker_bfs_filtered_test.go +++ b/plumbing/object/commit_walker_bfs_filtered_test.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" . "gopkg.in/check.v1" ) diff --git a/plumbing/object/commit_walker_ctime.go b/plumbing/object/commit_walker_ctime.go index 0191614..fbddf1d 100644 --- a/plumbing/object/commit_walker_ctime.go +++ b/plumbing/object/commit_walker_ctime.go @@ -5,8 +5,8 @@ import ( "github.com/emirpasic/gods/trees/binaryheap" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) type commitIteratorByCTime struct { diff --git a/plumbing/object/commit_walker_limit.go b/plumbing/object/commit_walker_limit.go index ee56e50..ac56a71 100644 --- a/plumbing/object/commit_walker_limit.go +++ b/plumbing/object/commit_walker_limit.go @@ -4,7 +4,7 @@ import ( "io" "time" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/storer" ) type commitLimitIter struct { diff --git a/plumbing/object/commit_walker_path.go b/plumbing/object/commit_walker_path.go index 6a49fd1..af6f745 100644 --- a/plumbing/object/commit_walker_path.go +++ b/plumbing/object/commit_walker_path.go @@ -3,9 +3,9 @@ package object import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/storer" ) type commitPathIter struct { diff --git a/plumbing/object/commit_walker_test.go b/plumbing/object/commit_walker_test.go index 9b0a260..628adaf 100644 --- a/plumbing/object/commit_walker_test.go +++ b/plumbing/object/commit_walker_test.go @@ -1,7 +1,7 @@ package object import ( - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" ) diff --git a/plumbing/object/commitgraph/commitnode.go b/plumbing/object/commitgraph/commitnode.go index e218d32..7abc58b 100644 --- a/plumbing/object/commitgraph/commitnode.go +++ b/plumbing/object/commitgraph/commitnode.go @@ -4,9 +4,9 @@ import ( "io"
"time"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
- "gopkg.in/src-d/go-git.v4/plumbing/storer"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/storer"
)
// CommitNode is generic interface encapsulating a lightweight commit object retrieved
diff --git a/plumbing/object/commitgraph/commitnode_graph.go b/plumbing/object/commitgraph/commitnode_graph.go index bd54e18..8e5d4e3 100644 --- a/plumbing/object/commitgraph/commitnode_graph.go +++ b/plumbing/object/commitgraph/commitnode_graph.go @@ -4,10 +4,10 @@ import ( "fmt"
"time"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
- "gopkg.in/src-d/go-git.v4/plumbing/storer"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/format/commitgraph"
+ "github.com/go-git/go-git/v5/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/storer"
)
// graphCommitNode is a reduced representation of Commit as presented in the commit
diff --git a/plumbing/object/commitgraph/commitnode_object.go b/plumbing/object/commitgraph/commitnode_object.go index 2779a54..bdf8cb7 100644 --- a/plumbing/object/commitgraph/commitnode_object.go +++ b/plumbing/object/commitgraph/commitnode_object.go @@ -4,9 +4,9 @@ import ( "math"
"time"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
- "gopkg.in/src-d/go-git.v4/plumbing/storer"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/object"
+ "github.com/go-git/go-git/v5/plumbing/storer"
)
// objectCommitNode is a representation of Commit as presented in the GIT object format.
diff --git a/plumbing/object/commitgraph/commitnode_test.go b/plumbing/object/commitgraph/commitnode_test.go index 954f873..4f9a0b8 100644 --- a/plumbing/object/commitgraph/commitnode_test.go +++ b/plumbing/object/commitgraph/commitnode_test.go @@ -6,11 +6,11 @@ import ( . "gopkg.in/check.v1"
fixtures "gopkg.in/src-d/go-git-fixtures.v3"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/cache"
- "gopkg.in/src-d/go-git.v4/plumbing/format/commitgraph"
- "gopkg.in/src-d/go-git.v4/plumbing/format/packfile"
- "gopkg.in/src-d/go-git.v4/storage/filesystem"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/cache"
+ "github.com/go-git/go-git/v5/plumbing/format/commitgraph"
+ "github.com/go-git/go-git/v5/plumbing/format/packfile"
+ "github.com/go-git/go-git/v5/storage/filesystem"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/plumbing/object/commitgraph/commitnode_walker_ctime.go b/plumbing/object/commitgraph/commitnode_walker_ctime.go index f6a1b6a..f2ed663 100644 --- a/plumbing/object/commitgraph/commitnode_walker_ctime.go +++ b/plumbing/object/commitgraph/commitnode_walker_ctime.go @@ -5,8 +5,8 @@ import ( "github.com/emirpasic/gods/trees/binaryheap"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/storer"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/storer"
)
type commitNodeIteratorByCTime struct {
diff --git a/plumbing/object/difftree.go b/plumbing/object/difftree.go index a30a29e..72411a5 100644 --- a/plumbing/object/difftree.go +++ b/plumbing/object/difftree.go @@ -4,8 +4,8 @@ import ( "bytes" "context" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // DiffTree compares the content and mode of the blobs found via two diff --git a/plumbing/object/difftree_test.go b/plumbing/object/difftree_test.go index 4af8684..699672b 100644 --- a/plumbing/object/difftree_test.go +++ b/plumbing/object/difftree_test.go @@ -3,14 +3,14 @@ package object import ( "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/storage/memory" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" + "github.com/go-git/go-git/v5/utils/merkletrie" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/file.go b/plumbing/object/file.go index 1c5fdbb..6cc5367 100644 --- a/plumbing/object/file.go +++ b/plumbing/object/file.go @@ -5,10 +5,10 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/utils/binary" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/utils/binary" + "github.com/go-git/go-git/v5/utils/ioutil" ) // File represents git file objects. diff --git a/plumbing/object/file_test.go b/plumbing/object/file_test.go index 4b92749..dce5e91 100644 --- a/plumbing/object/file_test.go +++ b/plumbing/object/file_test.go @@ -3,11 +3,11 @@ package object import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/merge_base.go b/plumbing/object/merge_base.go index 6f2568d..b412361 100644 --- a/plumbing/object/merge_base.go +++ b/plumbing/object/merge_base.go @@ -4,8 +4,8 @@ import ( "fmt" "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) // errIsReachable is thrown when first commit is an ancestor of the second diff --git a/plumbing/object/merge_base_test.go b/plumbing/object/merge_base_test.go index 72c9cd9..7d239cb 100644 --- a/plumbing/object/merge_base_test.go +++ b/plumbing/object/merge_base_test.go @@ -4,9 +4,9 @@ import ( "fmt" "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem" . "gopkg.in/check.v1" fixtures "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/object.go b/plumbing/object/object.go index c48a18d..13b1e91 100644 --- a/plumbing/object/object.go +++ b/plumbing/object/object.go @@ -10,8 +10,8 @@ import ( "strconv" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" ) // ErrUnsupportedObject trigger when a non-supported object is being decoded. diff --git a/plumbing/object/object_test.go b/plumbing/object/object_test.go index 8f0eede..de5f78a 100644 --- a/plumbing/object/object_test.go +++ b/plumbing/object/object_test.go @@ -6,11 +6,11 @@ import ( "testing" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/patch.go b/plumbing/object/patch.go index 32454ac..be1e609 100644 --- a/plumbing/object/patch.go +++ b/plumbing/object/patch.go @@ -9,10 +9,10 @@ import ( "math" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - fdiff "gopkg.in/src-d/go-git.v4/plumbing/format/diff" - "gopkg.in/src-d/go-git.v4/utils/diff" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" + fdiff "github.com/go-git/go-git/v5/plumbing/format/diff" + "github.com/go-git/go-git/v5/utils/diff" dmp "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/plumbing/object/patch_test.go b/plumbing/object/patch_test.go index 37944c3..b4bc1e8 100644 --- a/plumbing/object/patch_test.go +++ b/plumbing/object/patch_test.go @@ -3,9 +3,9 @@ package object import ( . "gopkg.in/check.v1" fixtures "gopkg.in/src-d/go-git-fixtures.v3" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem" ) type PatchSuite struct { diff --git a/plumbing/object/tag.go b/plumbing/object/tag.go index 9ee5509..4641658 100644 --- a/plumbing/object/tag.go +++ b/plumbing/object/tag.go @@ -10,9 +10,9 @@ import ( "golang.org/x/crypto/openpgp" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/utils/ioutil" ) // Tag represents an annotated tag object. It points to a single git object of diff --git a/plumbing/object/tag_test.go b/plumbing/object/tag_test.go index addec8d..8561112 100644 --- a/plumbing/object/tag_test.go +++ b/plumbing/object/tag_test.go @@ -8,10 +8,10 @@ import ( "time" fixtures "gopkg.in/src-d/go-git-fixtures.v3" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" ) diff --git a/plumbing/object/tree.go b/plumbing/object/tree.go index d0b4fff..d3c8c77 100644 --- a/plumbing/object/tree.go +++ b/plumbing/object/tree.go @@ -10,10 +10,10 @@ import ( "path/filepath" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/utils/ioutil" ) const ( diff --git a/plumbing/object/tree_test.go b/plumbing/object/tree_test.go index b408595..ab1a4f9 100644 --- a/plumbing/object/tree_test.go +++ b/plumbing/object/tree_test.go @@ -4,11 +4,11 @@ import ( "errors" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/filesystem" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/object/treenoder.go b/plumbing/object/treenoder.go index 52f0e61..b4891b9 100644 --- a/plumbing/object/treenoder.go +++ b/plumbing/object/treenoder.go @@ -3,9 +3,9 @@ package object import ( "io" - "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" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // A treenoder is a helper type that wraps git trees into merkletrie |