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 | |
| parent | 042981be1fc9aa9b182c3c35b7e2258845e13f49 (diff) | |
| download | go-git-2bdfd91f04068220a72feeade31defc09f2a601e.tar.gz | |
*: migration from gopkg to go modules
284 files changed, 847 insertions, 845 deletions
diff --git a/.travis.yml b/.travis.yml index 3a65f3e..00b478e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ go: - "1.11" - "1.12" -go_import_path: gopkg.in/src-d/go-git.v4 +go_import_path: github.com/go-git/go-git/v5 env: - GIT_VERSION=master @@ -15,7 +15,7 @@ COVERAGE_REPORT = coverage.txt COVERAGE_MODE = atomic ifneq ($(origin CI), undefined) - WORKDIR := $(GOPATH)/src/gopkg.in/src-d/go-git.v4 + WORKDIR := $(GOPATH)/src/github.com/go-git/go-git/v5 endif build-git: @@ -1,9 +1,9 @@  -[](https://godoc.org/github.com/src-d/go-git) [](https://travis-ci.org/src-d/go-git) [](https://ci.appveyor.com/project/mcuadros/go-git) [](https://codecov.io/github/src-d/go-git) [](https://goreportcard.com/report/github.com/src-d/go-git) +[](https://godoc.org/github.com/src-d/go-git) [](https://travis-ci.org/src-d/go-git) [](https://ci.appveyor.com/project/mcuadros/go-git) [](https://codecov.io/github/src-d/go-git) [](https://goreportcard.com/report/github.com/src-d/go-git) *go-git* is a highly extensible git implementation library written in **pure Go**. -It can be used to manipulate git repositories at low level *(plumbing)* or high level *(porcelain)*, through an idiomatic Go API. It also supports several types of storage, such as in-memory filesystems, or custom implementations thanks to the [`Storer`](https://godoc.org/gopkg.in/src-d/go-git.v4/plumbing/storer) interface. +It can be used to manipulate git repositories at low level *(plumbing)* or high level *(porcelain)*, through an idiomatic Go API. It also supports several types of storage, such as in-memory filesystems, or custom implementations thanks to the [`Storer`](https://godoc.org/github.com/go-git/go-git/v5/plumbing/storer) interface. It's being actively developed since 2015 and is being used extensively by [source{d}](https://sourced.tech/) and [Keybase](https://keybase.io/blog/encrypted-git-for-everyone), and by many other libraries and tools. @@ -21,7 +21,7 @@ Installation The recommended way to install *go-git* is: ``` -go get -u gopkg.in/src-d/go-git.v4/... +go get -u github.com/go-git/go-git/v5/... ``` > We use [gopkg.in](http://labix.org/gopkg.in) to version the API, this means that when `go get` clones the package, it's the latest tag matching `v4.*` that is cloned and not the master branch. diff --git a/_examples/branch/main.go b/_examples/branch/main.go index ff33ead..b4b69de 100644 --- a/_examples/branch/main.go +++ b/_examples/branch/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing" ) // An example of how to create and remove branches or any other kind of reference. diff --git a/_examples/checkout/main.go b/_examples/checkout/main.go index 5969eb4..92942c4 100644 --- a/_examples/checkout/main.go +++ b/_examples/checkout/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing" ) // Basic example of how to checkout a specific commit. diff --git a/_examples/clone/auth/basic/access_token/main.go b/_examples/clone/auth/basic/access_token/main.go index 7f6d121..c50d026 100644 --- a/_examples/clone/auth/basic/access_token/main.go +++ b/_examples/clone/auth/basic/access_token/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - git "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing/transport/http" + git "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing/transport/http" ) func main() { diff --git a/_examples/clone/auth/basic/username_password/main.go b/_examples/clone/auth/basic/username_password/main.go index 754558c..8457320 100644 --- a/_examples/clone/auth/basic/username_password/main.go +++ b/_examples/clone/auth/basic/username_password/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - git "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing/transport/http" + git "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing/transport/http" ) func main() { diff --git a/_examples/clone/main.go b/_examples/clone/main.go index 1952e76..0315f91 100644 --- a/_examples/clone/main.go +++ b/_examples/clone/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" ) // Basic example of how to clone a repository using clone options. diff --git a/_examples/commit/main.go b/_examples/commit/main.go index f184b81..c83dc98 100644 --- a/_examples/commit/main.go +++ b/_examples/commit/main.go @@ -7,9 +7,9 @@ import ( "path/filepath" "time" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing/object" ) // Basic example of how to commit changes to the current branch to an existing diff --git a/_examples/common_test.go b/_examples/common_test.go index 89d49a3..9945c87 100644 --- a/_examples/common_test.go +++ b/_examples/common_test.go @@ -75,7 +75,7 @@ func tempFolder() string { func packageFolder() string { return filepath.Join( build.Default.GOPATH, - "src", "gopkg.in/src-d/go-git.v4", + "src", "github.com/go-git/go-git/v5", ) } diff --git a/_examples/context/main.go b/_examples/context/main.go index f873055..7516e78 100644 --- a/_examples/context/main.go +++ b/_examples/context/main.go @@ -5,8 +5,8 @@ import ( "os" "os/signal" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" ) // Graceful cancellation example of a basic git operation such as Clone. diff --git a/_examples/custom_http/main.go b/_examples/custom_http/main.go index 0d45080..8dc1697 100644 --- a/_examples/custom_http/main.go +++ b/_examples/custom_http/main.go @@ -7,11 +7,11 @@ import ( "os" "time" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing/transport/client" - githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing/transport/client" + githttp "github.com/go-git/go-git/v5/plumbing/transport/http" + "github.com/go-git/go-git/v5/storage/memory" ) // Here is an example to configure http client according to our own needs. diff --git a/_examples/log/main.go b/_examples/log/main.go index 5807515..35de58a 100644 --- a/_examples/log/main.go +++ b/_examples/log/main.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "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/_examples" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/storage/memory" ) // Example of how to: diff --git a/_examples/ls-remote/main.go b/_examples/ls-remote/main.go index 42d9b4e..af038d6 100644 --- a/_examples/ls-remote/main.go +++ b/_examples/ls-remote/main.go @@ -3,9 +3,9 @@ package main import ( "log" - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/memory" ) // Retrieve remote tags without cloning repository diff --git a/_examples/ls/main.go b/_examples/ls/main.go index bb686f1..95a0c60 100644 --- a/_examples/ls/main.go +++ b/_examples/ls/main.go @@ -8,17 +8,17 @@ import ( "strings" "github.com/emirpasic/gods/trees/binaryheap" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - commitgraph_fmt "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/object/commitgraph" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/osfs" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/cache" + commitgraph_fmt "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/object/commitgraph" + "github.com/go-git/go-git/v5/storage/filesystem" + + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/osfs" ) // Example how to resolve a revision into its commit counterpart diff --git a/_examples/merge_base/helpers.go b/_examples/merge_base/helpers.go index 179a817..2b493c8 100644 --- a/_examples/merge_base/helpers.go +++ b/_examples/merge_base/helpers.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/object" ) func checkIfError(err error, code exitCode, mainReason string, v ...interface{}) { diff --git a/_examples/merge_base/main.go b/_examples/merge_base/main.go index fe6abc6..46725e1 100644 --- a/_examples/merge_base/main.go +++ b/_examples/merge_base/main.go @@ -3,9 +3,9 @@ package main import ( "os" - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" ) type exitCode int diff --git a/_examples/open/main.go b/_examples/open/main.go index 71c6b84..fdc8378 100644 --- a/_examples/open/main.go +++ b/_examples/open/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing/object" ) // Open an existing repository in a specific folder. diff --git a/_examples/progress/main.go b/_examples/progress/main.go index 074430f..c15e32f 100644 --- a/_examples/progress/main.go +++ b/_examples/progress/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" ) // Example of how to show the progress when you do a basic clone operation. diff --git a/_examples/pull/main.go b/_examples/pull/main.go index 6f258c8..cfd0551 100644 --- a/_examples/pull/main.go +++ b/_examples/pull/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" ) // Pull changes from a remote repository diff --git a/_examples/push/main.go b/_examples/push/main.go index 89d7773..01eceae 100644 --- a/_examples/push/main.go +++ b/_examples/push/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" ) // Example of how to open a repository in a specific path, and push to diff --git a/_examples/remotes/main.go b/_examples/remotes/main.go index 7cae8bb..b1a91a9 100644 --- a/_examples/remotes/main.go +++ b/_examples/remotes/main.go @@ -3,11 +3,11 @@ package main import ( "fmt" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) // Example of how to: diff --git a/_examples/revision/main.go b/_examples/revision/main.go index a2389bd..ddaf25e 100644 --- a/_examples/revision/main.go +++ b/_examples/revision/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing" ) // Example how to resolve a revision into its commit counterpart diff --git a/_examples/showcase/main.go b/_examples/showcase/main.go index 85f2b58..e2c2b53 100644 --- a/_examples/showcase/main.go +++ b/_examples/showcase/main.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing/object" - . "gopkg.in/src-d/go-git.v4/_examples" + . "github.com/go-git/go-git/v5/_examples" ) // Example of an specific use case: diff --git a/_examples/storage/README.md b/_examples/storage/README.md index b002515..92547cc 100644 --- a/_examples/storage/README.md +++ b/_examples/storage/README.md @@ -8,7 +8,7 @@ ### and what this means ... *git* has a very well defined storage system, the `.git` directory, present on any repository. This is the place where `git` stores all the [`objects`](https://git-scm.com/book/en/v2/Git-Internals-Git-Objects), [`references`](https://git-scm.com/book/es/v2/Git-Internals-Git-References) and [`configuration`](https://git-scm.com/docs/git-config#_configuration_file). This information is stored in plain files. -Our original **go-git** version was designed to work in memory, some time after we added support to read the `.git`, and now we have added support for fully customized [storages](https://godoc.org/gopkg.in/src-d/go-git.v4/storage#Storer). +Our original **go-git** version was designed to work in memory, some time after we added support to read the `.git`, and now we have added support for fully customized [storages](https://godoc.org/github.com/go-git/go-git/v5/storage#Storer). This means that the internal database of any repository can be saved and accessed on any support, databases, distributed filesystems, etc. This functionality is pretty similar to the [libgit2 backends](http://blog.deveo.com/your-git-repository-in-a-database-pluggable-backends-in-libgit2/) diff --git a/_examples/tag/main.go b/_examples/tag/main.go index 93192b0..3f47ab7 100644 --- a/_examples/tag/main.go +++ b/_examples/tag/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4" - . "gopkg.in/src-d/go-git.v4/_examples" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5" + . "github.com/go-git/go-git/v5/_examples" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" ) // Basic example of how to list tags. @@ -9,9 +9,9 @@ import ( "time" "unicode/utf8" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "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/object" + "github.com/go-git/go-git/v5/utils/diff" ) // BlameResult represents the result of a Blame operation. diff --git a/blame_test.go b/blame_test.go index e0ac129..b39f1dd 100644 --- a/blame_test.go +++ b/blame_test.go @@ -1,8 +1,8 @@ package git import ( - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/cli/go-git/receive_pack.go b/cli/go-git/receive_pack.go index 0f96a28..2a4fd1f 100644 --- a/cli/go-git/receive_pack.go +++ b/cli/go-git/receive_pack.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing/transport/file" + "github.com/go-git/go-git/v5/plumbing/transport/file" ) type CmdReceivePack struct { diff --git a/cli/go-git/upload_pack.go b/cli/go-git/upload_pack.go index da89de6..975c3a7 100644 --- a/cli/go-git/upload_pack.go +++ b/cli/go-git/upload_pack.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing/transport/file" + "github.com/go-git/go-git/v5/plumbing/transport/file" ) type CmdUploadPack struct { diff --git a/common_test.go b/common_test.go index dad0a37..6d8e8d0 100644 --- a/common_test.go +++ b/common_test.go @@ -3,17 +3,17 @@ package git import ( "testing" - "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/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "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/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" + + "github.com/go-git/go-billy/v5" + "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" - "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/config/branch.go b/config/branch.go index 20dde6e..fe86cf5 100644 --- a/config/branch.go +++ b/config/branch.go @@ -3,8 +3,8 @@ package config import ( "errors" - "gopkg.in/src-d/go-git.v4/plumbing" - format "gopkg.in/src-d/go-git.v4/plumbing/format/config" + "github.com/go-git/go-git/v5/plumbing" + format "github.com/go-git/go-git/v5/plumbing/format/config" ) var ( diff --git a/config/branch_test.go b/config/branch_test.go index 6d9ca86..a2c86cd 100644 --- a/config/branch_test.go +++ b/config/branch_test.go @@ -2,7 +2,7 @@ package config import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type BranchSuite struct{} diff --git a/config/config.go b/config/config.go index 321ca04..bec35b0 100644 --- a/config/config.go +++ b/config/config.go @@ -8,8 +8,8 @@ import ( "sort" "strconv" - "gopkg.in/src-d/go-git.v4/internal/url" - format "gopkg.in/src-d/go-git.v4/plumbing/format/config" + "github.com/go-git/go-git/v5/internal/url" + format "github.com/go-git/go-git/v5/plumbing/format/config" ) const ( diff --git a/config/config_test.go b/config/config_test.go index 54eb5e1..e5e3be5 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -2,7 +2,7 @@ package config import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type ConfigSuite struct{} diff --git a/config/modules.go b/config/modules.go index 90758d9..1c10aa3 100644 --- a/config/modules.go +++ b/config/modules.go @@ -5,7 +5,7 @@ import ( "errors" "regexp" - format "gopkg.in/src-d/go-git.v4/plumbing/format/config" + format "github.com/go-git/go-git/v5/plumbing/format/config" ) var ( diff --git a/config/refspec.go b/config/refspec.go index 14bb400..87cf2a6 100644 --- a/config/refspec.go +++ b/config/refspec.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) const ( diff --git a/config/refspec_test.go b/config/refspec_test.go index aaeac73..b9c43b2 100644 --- a/config/refspec_test.go +++ b/config/refspec_test.go @@ -4,7 +4,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type RefSpecSuite struct{} @@ -7,4 +7,4 @@ // It is highly extensible, we have been following the open/close principle in // its design to facilitate extensions, mainly focusing the efforts on the // persistence of the objects. -package git // import "gopkg.in/src-d/go-git.v4" +package git diff --git a/example_test.go b/example_test.go index 691b4ac..732d82a 100644 --- a/example_test.go +++ b/example_test.go @@ -8,13 +8,13 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/transport/http" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/transport/http" + "github.com/go-git/go-git/v5/storage/memory" - "gopkg.in/src-d/go-billy.v4/memfs" + "github.com/go-git/go-billy/v5/memfs" ) func ExampleClone() { @@ -1,4 +1,4 @@ -module gopkg.in/src-d/go-git.v4 +module github.com/go-git/go-git/v5 require ( github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect @@ -7,24 +7,23 @@ require ( github.com/emirpasic/gods v1.12.0 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect github.com/gliderlabs/ssh v0.2.2 + github.com/go-git/go-billy/v5 v5.0.0 github.com/google/go-cmp v0.3.0 github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 github.com/jessevdk/go-flags v1.4.0 github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd github.com/mitchellh/go-homedir v1.1.0 - github.com/pelletier/go-buffruneio v0.2.0 // indirect github.com/pkg/errors v0.8.1 // indirect - github.com/sergi/go-diff v1.0.0 + github.com/sergi/go-diff v1.1.0 github.com/src-d/gcfg v1.4.0 - github.com/stretchr/objx v0.2.0 // indirect github.com/xanzy/ssh-agent v0.2.1 - golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 - golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 + golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 + golang.org/x/net v0.0.0-20200301022130-244492dfa37a golang.org/x/text v0.3.2 - golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 - gopkg.in/src-d/go-billy.v4 v4.3.2 + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f + gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 + github.com/go-git/go-git/v5 v4.13.1 gopkg.in/warnings.v0 v0.1.2 // indirect ) @@ -5,6 +5,7 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -12,20 +13,16 @@ github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= -github.com/gliderlabs/ssh v0.1.3 h1:cBU46h1lYQk5f2Z+jZbewFKy+1zzE2aUX/ilcPDAm9M= -github.com/gliderlabs/ssh v0.1.3/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= -github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e h1:RgQk53JHp/Cjunrr1WlsXSZpqXn+uREuHvUVcK82CV8= -github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -34,61 +31,67 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd h1:sMHc2rZHuzQmrbVoSpt9HgerkXPyIeCSO6k0zUMGfFk= -golang.org/x/crypto v0.0.0-20190422183909-d864b10871cd/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190420063019-afa5a82059c6 h1:HdqqaWmYAUI7/dmByKKEw+yxDksGSo+9GjkUc9Zp34E= -golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190502183928-7f726cade0ab h1:9RfW3ktsOZxgo9YNbBAjq1FWzc/igwEcUzZz8IXgSbk= -golang.org/x/net v0.0.0-20190502183928-7f726cade0ab/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 h1:Ao/3l156eZf2AW5wK8a7/smtodRU+gha3+BeqJ69lRk= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9 h1:lkiLiLBHGoH3XnqSLUIaBsilGMUjI+Uy2Xu2JLUtTas= -golang.org/x/sys v0.0.0-20180903190138-2b024373dcd9/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e h1:D5TXcfTk7xF7hvieo4QErS3qqCB4teTffacDWr7CI+0= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/src-d/go-billy.v4 v4.3.0 h1:KtlZ4c1OWbIs4jCv5ZXrTqG8EQocr0g/d4DjNg70aek= -gopkg.in/src-d/go-billy.v4 v4.3.0/go.mod h1:tm33zBoOwxjYHZIE+OV8bxTWFMJLrconzFMd38aARFk= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg= gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg= gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g= +github.com/go-git/go-git/v5 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE= +github.com/go-git/go-git/v5 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8= gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/object_walker.go b/object_walker.go index 1fdcb36..3fcdd29 100644 --- a/object_walker.go +++ b/object_walker.go @@ -3,10 +3,10 @@ package git import ( "fmt" - "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/object" - "gopkg.in/src-d/go-git.v4/storage" + "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/object" + "github.com/go-git/go-git/v5/storage" ) type objectWalker struct { @@ -7,11 +7,11 @@ import ( "time" "golang.org/x/crypto/openpgp" - "gopkg.in/src-d/go-git.v4/config" - "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/protocol/packp/sideband" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/config" + "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/protocol/packp/sideband" + "github.com/go-git/go-git/v5/plumbing/transport" ) // SubmoduleRescursivity defines how depth will affect any submodule recursive diff --git a/options_test.go b/options_test.go index 5274113..b9e9096 100644 --- a/options_test.go +++ b/options_test.go @@ -2,7 +2,7 @@ package git import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/object" ) type OptionsSuite struct { diff --git a/plumbing/cache/common.go b/plumbing/cache/common.go index 2b7f36a..7b0d0c7 100644 --- a/plumbing/cache/common.go +++ b/plumbing/cache/common.go @@ -1,6 +1,6 @@ package cache -import "gopkg.in/src-d/go-git.v4/plumbing" +import "github.com/go-git/go-git/v5/plumbing" const ( Byte FileSize = 1 << (iota * 10) diff --git a/plumbing/cache/object_lru.go b/plumbing/cache/object_lru.go index cd3712b..c50d0d1 100644 --- a/plumbing/cache/object_lru.go +++ b/plumbing/cache/object_lru.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) // ObjectLRU implements an object cache with an LRU eviction policy and a diff --git a/plumbing/cache/object_test.go b/plumbing/cache/object_test.go index 2e8fa7b..d3a217c 100644 --- a/plumbing/cache/object_test.go +++ b/plumbing/cache/object_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" ) diff --git a/plumbing/format/commitgraph/commitgraph.go b/plumbing/format/commitgraph/commitgraph.go index e43cd89..3d59323 100644 --- a/plumbing/format/commitgraph/commitgraph.go +++ b/plumbing/format/commitgraph/commitgraph.go @@ -3,7 +3,7 @@ package commitgraph import (
"time"
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
// CommitData is a reduced representation of Commit as presented in the commit graph
diff --git a/plumbing/format/commitgraph/commitgraph_test.go b/plumbing/format/commitgraph/commitgraph_test.go index 0214f49..ebfe7e2 100644 --- a/plumbing/format/commitgraph/commitgraph_test.go +++ b/plumbing/format/commitgraph/commitgraph_test.go @@ -8,8 +8,8 @@ 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/format/commitgraph"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/plumbing/format/commitgraph"
)
func Test(t *testing.T) { TestingT(t) }
diff --git a/plumbing/format/commitgraph/encoder.go b/plumbing/format/commitgraph/encoder.go index 615e833..d34076f 100644 --- a/plumbing/format/commitgraph/encoder.go +++ b/plumbing/format/commitgraph/encoder.go @@ -5,8 +5,8 @@ import ( "hash"
"io"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/utils/binary"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/utils/binary"
)
// Encoder writes MemoryIndex structs to an output stream.
diff --git a/plumbing/format/commitgraph/file.go b/plumbing/format/commitgraph/file.go index 1f82abd..0ce7198 100644 --- a/plumbing/format/commitgraph/file.go +++ b/plumbing/format/commitgraph/file.go @@ -7,8 +7,8 @@ import ( "io"
"time"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/utils/binary"
+ "github.com/go-git/go-git/v5/plumbing"
+ "github.com/go-git/go-git/v5/utils/binary"
)
var (
diff --git a/plumbing/format/commitgraph/memory.go b/plumbing/format/commitgraph/memory.go index f5afd4c..b24ce36 100644 --- a/plumbing/format/commitgraph/memory.go +++ b/plumbing/format/commitgraph/memory.go @@ -1,7 +1,7 @@ package commitgraph
import (
- "gopkg.in/src-d/go-git.v4/plumbing"
+ "github.com/go-git/go-git/v5/plumbing"
)
// MemoryIndex provides a way to build the commit-graph in memory
diff --git a/plumbing/format/diff/patch.go b/plumbing/format/diff/patch.go index 7c6cf4a..39a66a1 100644 --- a/plumbing/format/diff/patch.go +++ b/plumbing/format/diff/patch.go @@ -1,8 +1,8 @@ package diff import ( - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" ) // Operation defines the operation of a diff item. diff --git a/plumbing/format/diff/unified_encoder.go b/plumbing/format/diff/unified_encoder.go index ce3bc7c..f2bc910 100644 --- a/plumbing/format/diff/unified_encoder.go +++ b/plumbing/format/diff/unified_encoder.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) const ( diff --git a/plumbing/format/diff/unified_encoder_test.go b/plumbing/format/diff/unified_encoder_test.go index 091a96a..1a9b2dd 100644 --- a/plumbing/format/diff/unified_encoder_test.go +++ b/plumbing/format/diff/unified_encoder_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" . "gopkg.in/check.v1" ) diff --git a/plumbing/format/gitattributes/dir.go b/plumbing/format/gitattributes/dir.go index d5c1e6a..b0dc82b 100644 --- a/plumbing/format/gitattributes/dir.go +++ b/plumbing/format/gitattributes/dir.go @@ -4,9 +4,9 @@ import ( "os" "os/user" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing/format/config" - gioutil "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing/format/config" + gioutil "github.com/go-git/go-git/v5/utils/ioutil" ) const ( diff --git a/plumbing/format/gitattributes/dir_test.go b/plumbing/format/gitattributes/dir_test.go index 34b915d..0ecc3b3 100644 --- a/plumbing/format/gitattributes/dir_test.go +++ b/plumbing/format/gitattributes/dir_test.go @@ -5,9 +5,9 @@ import ( "os/user" "strconv" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/memfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/memfs" ) type MatcherSuite struct { diff --git a/plumbing/format/gitignore/dir.go b/plumbing/format/gitignore/dir.go index 1e88970..f4444bf 100644 --- a/plumbing/format/gitignore/dir.go +++ b/plumbing/format/gitignore/dir.go @@ -7,9 +7,9 @@ import ( "os/user" "strings" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing/format/config" - gioutil "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing/format/config" + gioutil "github.com/go-git/go-git/v5/utils/ioutil" ) const ( diff --git a/plumbing/format/gitignore/dir_test.go b/plumbing/format/gitignore/dir_test.go index 13e2d82..c0301f7 100644 --- a/plumbing/format/gitignore/dir_test.go +++ b/plumbing/format/gitignore/dir_test.go @@ -5,9 +5,9 @@ import ( "os/user" "strconv" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/memfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/memfs" ) type MatcherSuite struct { @@ -17,7 +17,7 @@ type MatcherSuite struct { MEFS billy.Filesystem // root that contains user home, but missing excludesfile entry MIFS billy.Filesystem // root that contains user home, but missing .gitnignore - SFS billy.Filesystem // root that contains /etc/gitconfig + SFS billy.Filesystem // root that contains /etc/gitconfig } var _ = Suite(&MatcherSuite{}) diff --git a/plumbing/format/idxfile/decoder.go b/plumbing/format/idxfile/decoder.go index d1a8a2c..7768bd6 100644 --- a/plumbing/format/idxfile/decoder.go +++ b/plumbing/format/idxfile/decoder.go @@ -6,7 +6,7 @@ import ( "errors" "io" - "gopkg.in/src-d/go-git.v4/utils/binary" + "github.com/go-git/go-git/v5/utils/binary" ) var ( diff --git a/plumbing/format/idxfile/decoder_test.go b/plumbing/format/idxfile/decoder_test.go index b43d7c5..286fe6f 100644 --- a/plumbing/format/idxfile/decoder_test.go +++ b/plumbing/format/idxfile/decoder_test.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" - . "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing" + . "github.com/go-git/go-git/v5/plumbing/format/idxfile" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/idxfile/encoder.go b/plumbing/format/idxfile/encoder.go index e479511..26b2e4d 100644 --- a/plumbing/format/idxfile/encoder.go +++ b/plumbing/format/idxfile/encoder.go @@ -5,7 +5,7 @@ import ( "hash" "io" - "gopkg.in/src-d/go-git.v4/utils/binary" + "github.com/go-git/go-git/v5/utils/binary" ) // Encoder writes MemoryIndex structs to an output stream. diff --git a/plumbing/format/idxfile/encoder_test.go b/plumbing/format/idxfile/encoder_test.go index e8deeea..9321f4f 100644 --- a/plumbing/format/idxfile/encoder_test.go +++ b/plumbing/format/idxfile/encoder_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io/ioutil" - . "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" + . "github.com/go-git/go-git/v5/plumbing/format/idxfile" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/idxfile/idxfile.go b/plumbing/format/idxfile/idxfile.go index 14b5860..64dd8dc 100644 --- a/plumbing/format/idxfile/idxfile.go +++ b/plumbing/format/idxfile/idxfile.go @@ -7,7 +7,7 @@ import ( encbin "encoding/binary" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) const ( diff --git a/plumbing/format/idxfile/idxfile_test.go b/plumbing/format/idxfile/idxfile_test.go index 0e0ca2a..ddb561b 100644 --- a/plumbing/format/idxfile/idxfile_test.go +++ b/plumbing/format/idxfile/idxfile_test.go @@ -7,8 +7,8 @@ import ( "io" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/idxfile/writer.go b/plumbing/format/idxfile/writer.go index fcc78c5..daa1605 100644 --- a/plumbing/format/idxfile/writer.go +++ b/plumbing/format/idxfile/writer.go @@ -7,8 +7,8 @@ import ( "sort" "sync" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/utils/binary" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/utils/binary" ) // objects implements sort.Interface and uses hash as sorting key. diff --git a/plumbing/format/idxfile/writer_test.go b/plumbing/format/idxfile/writer_test.go index 912211d..5ced785 100644 --- a/plumbing/format/idxfile/writer_test.go +++ b/plumbing/format/idxfile/writer_test.go @@ -5,9 +5,9 @@ import ( "encoding/base64" "io/ioutil" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/index/decoder.go b/plumbing/format/index/decoder.go index 98f92fd..79d0b9e 100644 --- a/plumbing/format/index/decoder.go +++ b/plumbing/format/index/decoder.go @@ -11,8 +11,8 @@ import ( "strconv" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/utils/binary" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/utils/binary" ) var ( diff --git a/plumbing/format/index/decoder_test.go b/plumbing/format/index/decoder_test.go index 92d312d..3555f7b 100644 --- a/plumbing/format/index/decoder_test.go +++ b/plumbing/format/index/decoder_test.go @@ -3,8 +3,8 @@ package index import ( "testing" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/index/encoder.go b/plumbing/format/index/encoder.go index 7111314..00d4e7a 100644 --- a/plumbing/format/index/encoder.go +++ b/plumbing/format/index/encoder.go @@ -9,7 +9,7 @@ import ( "sort" "time" - "gopkg.in/src-d/go-git.v4/utils/binary" + "github.com/go-git/go-git/v5/utils/binary" ) var ( diff --git a/plumbing/format/index/encoder_test.go b/plumbing/format/index/encoder_test.go index ea121fc..17585a0 100644 --- a/plumbing/format/index/encoder_test.go +++ b/plumbing/format/index/encoder_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) func (s *IndexSuite) TestEncode(c *C) { diff --git a/plumbing/format/index/index.go b/plumbing/format/index/index.go index 6653c91..649416a 100644 --- a/plumbing/format/index/index.go +++ b/plumbing/format/index/index.go @@ -7,8 +7,8 @@ import ( "path/filepath" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/filemode" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/filemode" ) var ( diff --git a/plumbing/format/objfile/common_test.go b/plumbing/format/objfile/common_test.go index 7c8b75c..ec8c280 100644 --- a/plumbing/format/objfile/common_test.go +++ b/plumbing/format/objfile/common_test.go @@ -5,7 +5,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type objfileFixture struct { diff --git a/plumbing/format/objfile/reader.go b/plumbing/format/objfile/reader.go index c4467e4..b6b2ca0 100644 --- a/plumbing/format/objfile/reader.go +++ b/plumbing/format/objfile/reader.go @@ -6,8 +6,8 @@ import ( "io" "strconv" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/packfile" ) var ( diff --git a/plumbing/format/objfile/reader_test.go b/plumbing/format/objfile/reader_test.go index 715792d..48e7f1c 100644 --- a/plumbing/format/objfile/reader_test.go +++ b/plumbing/format/objfile/reader_test.go @@ -8,7 +8,7 @@ import ( "io/ioutil" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type SuiteReader struct{} diff --git a/plumbing/format/objfile/writer.go b/plumbing/format/objfile/writer.go index 5555243..2a96a43 100644 --- a/plumbing/format/objfile/writer.go +++ b/plumbing/format/objfile/writer.go @@ -6,7 +6,7 @@ import ( "io" "strconv" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) var ( diff --git a/plumbing/format/objfile/writer_test.go b/plumbing/format/objfile/writer_test.go index 46dbea6..73ee662 100644 --- a/plumbing/format/objfile/writer_test.go +++ b/plumbing/format/objfile/writer_test.go @@ -7,7 +7,7 @@ import ( "io" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type SuiteWriter struct{} diff --git a/plumbing/format/packfile/common.go b/plumbing/format/packfile/common.go index f82c1ab..df423ad 100644 --- a/plumbing/format/packfile/common.go +++ b/plumbing/format/packfile/common.go @@ -6,8 +6,8 @@ import ( "io" "sync" - "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/storer" + "github.com/go-git/go-git/v5/utils/ioutil" ) var signature = []byte{'P', 'A', 'C', 'K'} diff --git a/plumbing/format/packfile/common_test.go b/plumbing/format/packfile/common_test.go index eafc617..c6d1038 100644 --- a/plumbing/format/packfile/common_test.go +++ b/plumbing/format/packfile/common_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" ) diff --git a/plumbing/format/packfile/delta_selector.go b/plumbing/format/packfile/delta_selector.go index 6710085..4b60ff3 100644 --- a/plumbing/format/packfile/delta_selector.go +++ b/plumbing/format/packfile/delta_selector.go @@ -4,8 +4,8 @@ import ( "sort" "sync" - "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" ) const ( diff --git a/plumbing/format/packfile/delta_selector_test.go b/plumbing/format/packfile/delta_selector_test.go index 7d7fd0c..3d196d3 100644 --- a/plumbing/format/packfile/delta_selector_test.go +++ b/plumbing/format/packfile/delta_selector_test.go @@ -1,8 +1,8 @@ package packfile import ( - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" ) diff --git a/plumbing/format/packfile/diff_delta.go b/plumbing/format/packfile/diff_delta.go index 43f87a0..1d4b384 100644 --- a/plumbing/format/packfile/diff_delta.go +++ b/plumbing/format/packfile/diff_delta.go @@ -3,7 +3,7 @@ package packfile import ( "bytes" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) // See https://github.com/jelmer/dulwich/blob/master/dulwich/pack.py and diff --git a/plumbing/format/packfile/encoder.go b/plumbing/format/packfile/encoder.go index b077918..65fae52 100644 --- a/plumbing/format/packfile/encoder.go +++ b/plumbing/format/packfile/encoder.go @@ -6,9 +6,9 @@ import ( "fmt" "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/binary" + "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/binary" ) // Encoder gets the data from the storage and write it into the writer in PACK diff --git a/plumbing/format/packfile/encoder_advanced_test.go b/plumbing/format/packfile/encoder_advanced_test.go index e15126e..e63b5b5 100644 --- a/plumbing/format/packfile/encoder_advanced_test.go +++ b/plumbing/format/packfile/encoder_advanced_test.go @@ -6,13 +6,13 @@ import ( "math/rand" "testing" - "gopkg.in/src-d/go-billy.v4/memfs" - "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/idxfile" - . "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" + "github.com/go-git/go-billy/v5/memfs" + "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/idxfile" + . "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" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/packfile/encoder_test.go b/plumbing/format/packfile/encoder_test.go index 80b916d..1721625 100644 --- a/plumbing/format/packfile/encoder_test.go +++ b/plumbing/format/packfile/encoder_test.go @@ -5,10 +5,10 @@ import ( "io" stdioutil "io/ioutil" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-billy/v5/memfs" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/packfile/fsobject.go b/plumbing/format/packfile/fsobject.go index a268bce..c5edaf5 100644 --- a/plumbing/format/packfile/fsobject.go +++ b/plumbing/format/packfile/fsobject.go @@ -3,10 +3,10 @@ package packfile import ( "io" - billy "gopkg.in/src-d/go-billy.v4" - "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/idxfile" + billy "github.com/go-git/go-billy/v5" + "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/idxfile" ) // FSObject is an object from the packfile on the filesystem. diff --git a/plumbing/format/packfile/object_pack.go b/plumbing/format/packfile/object_pack.go index dfea571..8ce29ef 100644 --- a/plumbing/format/packfile/object_pack.go +++ b/plumbing/format/packfile/object_pack.go @@ -1,7 +1,7 @@ package packfile import ( - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) // ObjectToPack is a representation of an object that is going to be into a diff --git a/plumbing/format/packfile/object_pack_test.go b/plumbing/format/packfile/object_pack_test.go index ddc7ab5..dc1a285 100644 --- a/plumbing/format/packfile/object_pack_test.go +++ b/plumbing/format/packfile/object_pack_test.go @@ -3,7 +3,7 @@ package packfile import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" ) diff --git a/plumbing/format/packfile/packfile.go b/plumbing/format/packfile/packfile.go index 21a15de..d060041 100644 --- a/plumbing/format/packfile/packfile.go +++ b/plumbing/format/packfile/packfile.go @@ -5,11 +5,11 @@ import ( "io" "os" - billy "gopkg.in/src-d/go-billy.v4" - "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/idxfile" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + billy "github.com/go-git/go-billy/v5" + "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/idxfile" + "github.com/go-git/go-git/v5/plumbing/storer" ) var ( diff --git a/plumbing/format/packfile/packfile_test.go b/plumbing/format/packfile/packfile_test.go index 455fe65..882a907 100644 --- a/plumbing/format/packfile/packfile_test.go +++ b/plumbing/format/packfile/packfile_test.go @@ -4,13 +4,13 @@ import ( "io" "math" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" 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/format/idxfile" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "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/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing/storer" ) type PackfileSuite struct { diff --git a/plumbing/format/packfile/parser.go b/plumbing/format/packfile/parser.go index d8c0f75..d411c5b 100644 --- a/plumbing/format/packfile/parser.go +++ b/plumbing/format/packfile/parser.go @@ -6,9 +6,9 @@ import ( "io" "io/ioutil" - "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/storer" + "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/storer" ) var ( diff --git a/plumbing/format/packfile/parser_test.go b/plumbing/format/packfile/parser_test.go index 6e7c84b..9d97cef 100644 --- a/plumbing/format/packfile/parser_test.go +++ b/plumbing/format/packfile/parser_test.go @@ -4,10 +4,10 @@ import ( "io" "testing" - git "gopkg.in/src-d/go-git.v4" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + git "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing/storer" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/packfile/patch_delta.go b/plumbing/format/packfile/patch_delta.go index e1a5141..57c9da7 100644 --- a/plumbing/format/packfile/patch_delta.go +++ b/plumbing/format/packfile/patch_delta.go @@ -5,7 +5,7 @@ import ( "errors" "io" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) // See https://github.com/git/git/blob/49fa3dc76179e04b0833542fa52d0f287a4955ac/delta.h diff --git a/plumbing/format/packfile/scanner.go b/plumbing/format/packfile/scanner.go index 7b44192..6e6a687 100644 --- a/plumbing/format/packfile/scanner.go +++ b/plumbing/format/packfile/scanner.go @@ -11,9 +11,9 @@ import ( stdioutil "io/ioutil" "sync" - "gopkg.in/src-d/go-git.v4/plumbing" - "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" + "github.com/go-git/go-git/v5/utils/binary" + "github.com/go-git/go-git/v5/utils/ioutil" ) var ( diff --git a/plumbing/format/packfile/scanner_test.go b/plumbing/format/packfile/scanner_test.go index 3078477..5c1d5c9 100644 --- a/plumbing/format/packfile/scanner_test.go +++ b/plumbing/format/packfile/scanner_test.go @@ -4,7 +4,7 @@ import ( "bytes" "io" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/format/pktline/encoder_test.go b/plumbing/format/pktline/encoder_test.go index d1258af..4a7c7b8 100644 --- a/plumbing/format/pktline/encoder_test.go +++ b/plumbing/format/pktline/encoder_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" ) diff --git a/plumbing/format/pktline/scanner_test.go b/plumbing/format/pktline/scanner_test.go index 9660c2d..479ad77 100644 --- a/plumbing/format/pktline/scanner_test.go +++ b/plumbing/format/pktline/scanner_test.go @@ -7,7 +7,7 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" ) 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 diff --git a/plumbing/protocol/packp/advrefs.go b/plumbing/protocol/packp/advrefs.go index 487ee19..ab286c6 100644 --- a/plumbing/protocol/packp/advrefs.go +++ b/plumbing/protocol/packp/advrefs.go @@ -5,10 +5,10 @@ import ( "sort" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "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/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/memory" ) // AdvRefs values represent the information transmitted on an diff --git a/plumbing/protocol/packp/advrefs_decode.go b/plumbing/protocol/packp/advrefs_decode.go index 80f5b4e..63bbe5a 100644 --- a/plumbing/protocol/packp/advrefs_decode.go +++ b/plumbing/protocol/packp/advrefs_decode.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) // Decode reads the next advertised-refs message form its input and diff --git a/plumbing/protocol/packp/advrefs_decode_test.go b/plumbing/protocol/packp/advrefs_decode_test.go index e9a01f8..83b0b01 100644 --- a/plumbing/protocol/packp/advrefs_decode_test.go +++ b/plumbing/protocol/packp/advrefs_decode_test.go @@ -5,9 +5,9 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/advrefs_encode.go b/plumbing/protocol/packp/advrefs_encode.go index c23e3fe..fb9bd88 100644 --- a/plumbing/protocol/packp/advrefs_encode.go +++ b/plumbing/protocol/packp/advrefs_encode.go @@ -6,9 +6,9 @@ import ( "io" "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" ) // Encode writes the AdvRefs encoding to a writer. diff --git a/plumbing/protocol/packp/advrefs_encode_test.go b/plumbing/protocol/packp/advrefs_encode_test.go index 3ae84a7..a01e833 100644 --- a/plumbing/protocol/packp/advrefs_encode_test.go +++ b/plumbing/protocol/packp/advrefs_encode_test.go @@ -4,9 +4,9 @@ import ( "bytes" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/advrefs_test.go b/plumbing/protocol/packp/advrefs_test.go index bb8d032..d37f127 100644 --- a/plumbing/protocol/packp/advrefs_test.go +++ b/plumbing/protocol/packp/advrefs_test.go @@ -6,9 +6,9 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/common_test.go b/plumbing/protocol/packp/common_test.go index c055fee..7989388 100644 --- a/plumbing/protocol/packp/common_test.go +++ b/plumbing/protocol/packp/common_test.go @@ -5,7 +5,7 @@ import ( "io" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/report_status.go b/plumbing/protocol/packp/report_status.go index 29c1a4c..e2a0a10 100644 --- a/plumbing/protocol/packp/report_status.go +++ b/plumbing/protocol/packp/report_status.go @@ -6,8 +6,8 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) const ( diff --git a/plumbing/protocol/packp/report_status_test.go b/plumbing/protocol/packp/report_status_test.go index 1c3fa81..32b9e5b 100644 --- a/plumbing/protocol/packp/report_status_test.go +++ b/plumbing/protocol/packp/report_status_test.go @@ -3,8 +3,8 @@ package packp import ( "bytes" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/shallowupd.go b/plumbing/protocol/packp/shallowupd.go index fce4e3b..fe4fe68 100644 --- a/plumbing/protocol/packp/shallowupd.go +++ b/plumbing/protocol/packp/shallowupd.go @@ -5,8 +5,8 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) const ( diff --git a/plumbing/protocol/packp/shallowupd_test.go b/plumbing/protocol/packp/shallowupd_test.go index 97a13fc..a78ba90 100644 --- a/plumbing/protocol/packp/shallowupd_test.go +++ b/plumbing/protocol/packp/shallowupd_test.go @@ -3,7 +3,7 @@ package packp import ( "bytes" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/sideband/demux.go b/plumbing/protocol/packp/sideband/demux.go index 352336d..0116f96 100644 --- a/plumbing/protocol/packp/sideband/demux.go +++ b/plumbing/protocol/packp/sideband/demux.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) // ErrMaxPackedExceeded returned by Read, if the maximum packed size is exceeded diff --git a/plumbing/protocol/packp/sideband/demux_test.go b/plumbing/protocol/packp/sideband/demux_test.go index 3d2d6ed..6cda703 100644 --- a/plumbing/protocol/packp/sideband/demux_test.go +++ b/plumbing/protocol/packp/sideband/demux_test.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/sideband/muxer.go b/plumbing/protocol/packp/sideband/muxer.go index 45fecc2..d51ac82 100644 --- a/plumbing/protocol/packp/sideband/muxer.go +++ b/plumbing/protocol/packp/sideband/muxer.go @@ -3,7 +3,7 @@ package sideband import ( "io" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) // Muxer multiplex the packfile along with the progress messages and the error diff --git a/plumbing/protocol/packp/srvresp.go b/plumbing/protocol/packp/srvresp.go index 6a91991..b3a7ee8 100644 --- a/plumbing/protocol/packp/srvresp.go +++ b/plumbing/protocol/packp/srvresp.go @@ -7,8 +7,8 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) const ackLineLen = 44 diff --git a/plumbing/protocol/packp/srvresp_test.go b/plumbing/protocol/packp/srvresp_test.go index c8ef520..02fab42 100644 --- a/plumbing/protocol/packp/srvresp_test.go +++ b/plumbing/protocol/packp/srvresp_test.go @@ -4,7 +4,7 @@ import ( "bufio" "bytes" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/ulreq.go b/plumbing/protocol/packp/ulreq.go index 72895e3..44db8e4 100644 --- a/plumbing/protocol/packp/ulreq.go +++ b/plumbing/protocol/packp/ulreq.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" ) // UploadRequest values represent the information transmitted on a diff --git a/plumbing/protocol/packp/ulreq_decode.go b/plumbing/protocol/packp/ulreq_decode.go index bcd642d..449b729 100644 --- a/plumbing/protocol/packp/ulreq_decode.go +++ b/plumbing/protocol/packp/ulreq_decode.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) // Decode reads the next upload-request form its input and diff --git a/plumbing/protocol/packp/ulreq_decode_test.go b/plumbing/protocol/packp/ulreq_decode_test.go index 82a4e1f..9628f0f 100644 --- a/plumbing/protocol/packp/ulreq_decode_test.go +++ b/plumbing/protocol/packp/ulreq_decode_test.go @@ -6,9 +6,9 @@ import ( "sort" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/ulreq_encode.go b/plumbing/protocol/packp/ulreq_encode.go index dcfeb83..4863076 100644 --- a/plumbing/protocol/packp/ulreq_encode.go +++ b/plumbing/protocol/packp/ulreq_encode.go @@ -6,8 +6,8 @@ import ( "io" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) // Encode writes the UlReq encoding of u to the stream. diff --git a/plumbing/protocol/packp/ulreq_encode_test.go b/plumbing/protocol/packp/ulreq_encode_test.go index 0890678..a16e321 100644 --- a/plumbing/protocol/packp/ulreq_encode_test.go +++ b/plumbing/protocol/packp/ulreq_encode_test.go @@ -4,9 +4,9 @@ import ( "bytes" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/ulreq_test.go b/plumbing/protocol/packp/ulreq_test.go index f000b91..a0bb401 100644 --- a/plumbing/protocol/packp/ulreq_test.go +++ b/plumbing/protocol/packp/ulreq_test.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/updreq.go b/plumbing/protocol/packp/updreq.go index 73be117..b63b023 100644 --- a/plumbing/protocol/packp/updreq.go +++ b/plumbing/protocol/packp/updreq.go @@ -4,9 +4,9 @@ import ( "errors" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/sideband" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/sideband" ) var ( diff --git a/plumbing/protocol/packp/updreq_decode.go b/plumbing/protocol/packp/updreq_decode.go index 59f095f..2c9843a 100644 --- a/plumbing/protocol/packp/updreq_decode.go +++ b/plumbing/protocol/packp/updreq_decode.go @@ -8,8 +8,8 @@ import ( "io" "io/ioutil" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" ) var ( diff --git a/plumbing/protocol/packp/updreq_decode_test.go b/plumbing/protocol/packp/updreq_decode_test.go index c084334..2630112 100644 --- a/plumbing/protocol/packp/updreq_decode_test.go +++ b/plumbing/protocol/packp/updreq_decode_test.go @@ -5,8 +5,8 @@ import ( "io" "io/ioutil" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/updreq_encode.go b/plumbing/protocol/packp/updreq_encode.go index 44c0573..6a79653 100644 --- a/plumbing/protocol/packp/updreq_encode.go +++ b/plumbing/protocol/packp/updreq_encode.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" ) var ( diff --git a/plumbing/protocol/packp/updreq_encode_test.go b/plumbing/protocol/packp/updreq_encode_test.go index 77b715d..5ad2b1b 100644 --- a/plumbing/protocol/packp/updreq_encode_test.go +++ b/plumbing/protocol/packp/updreq_encode_test.go @@ -3,8 +3,8 @@ package packp import ( "bytes" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" . "gopkg.in/check.v1" "io/ioutil" diff --git a/plumbing/protocol/packp/updreq_test.go b/plumbing/protocol/packp/updreq_test.go index 2412fbf..c4ccbaf 100644 --- a/plumbing/protocol/packp/updreq_test.go +++ b/plumbing/protocol/packp/updreq_test.go @@ -1,7 +1,7 @@ package packp import ( - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/uppackreq.go b/plumbing/protocol/packp/uppackreq.go index 831ef8f..de2206b 100644 --- a/plumbing/protocol/packp/uppackreq.go +++ b/plumbing/protocol/packp/uppackreq.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" ) // UploadPackRequest represents a upload-pack request. diff --git a/plumbing/protocol/packp/uppackreq_test.go b/plumbing/protocol/packp/uppackreq_test.go index f776c07..f723e3c 100644 --- a/plumbing/protocol/packp/uppackreq_test.go +++ b/plumbing/protocol/packp/uppackreq_test.go @@ -3,8 +3,8 @@ package packp import ( "bytes" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/protocol/packp/uppackresp.go b/plumbing/protocol/packp/uppackresp.go index c18e159..a9a7192 100644 --- a/plumbing/protocol/packp/uppackresp.go +++ b/plumbing/protocol/packp/uppackresp.go @@ -6,8 +6,8 @@ import ( "bufio" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/utils/ioutil" ) // ErrUploadPackResponseNotDecoded is returned if Read is called without diff --git a/plumbing/protocol/packp/uppackresp_test.go b/plumbing/protocol/packp/uppackresp_test.go index 0d96ce7..8950fa9 100644 --- a/plumbing/protocol/packp/uppackresp_test.go +++ b/plumbing/protocol/packp/uppackresp_test.go @@ -4,10 +4,10 @@ import ( "bytes" "io/ioutil" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type UploadPackResponseSuite struct{} diff --git a/plumbing/revlist/revlist.go b/plumbing/revlist/revlist.go index 7ad71ac..b910987 100644 --- a/plumbing/revlist/revlist.go +++ b/plumbing/revlist/revlist.go @@ -6,10 +6,10 @@ import ( "fmt" "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/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/filemode" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/storer" ) // Objects applies a complementary set. It gets all the hashes from all diff --git a/plumbing/revlist/revlist_test.go b/plumbing/revlist/revlist_test.go index ceae727..3b09630 100644 --- a/plumbing/revlist/revlist_test.go +++ b/plumbing/revlist/revlist_test.go @@ -3,11 +3,11 @@ package revlist import ( "testing" - "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/object" - "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/object" + "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/storer/index.go b/plumbing/storer/index.go index e087296..3311394 100644 --- a/plumbing/storer/index.go +++ b/plumbing/storer/index.go @@ -1,6 +1,6 @@ package storer -import "gopkg.in/src-d/go-git.v4/plumbing/format/index" +import "github.com/go-git/go-git/v5/plumbing/format/index" // IndexStorer generic storage of index.Index type IndexStorer interface { diff --git a/plumbing/storer/object.go b/plumbing/storer/object.go index c84960a..dfe309d 100644 --- a/plumbing/storer/object.go +++ b/plumbing/storer/object.go @@ -5,7 +5,7 @@ import ( "io" "time" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) var ( diff --git a/plumbing/storer/object_test.go b/plumbing/storer/object_test.go index bc22f7b..8dc3623 100644 --- a/plumbing/storer/object_test.go +++ b/plumbing/storer/object_test.go @@ -5,7 +5,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) func Test(t *testing.T) { TestingT(t) } diff --git a/plumbing/storer/reference.go b/plumbing/storer/reference.go index cce72b4..1d74ef3 100644 --- a/plumbing/storer/reference.go +++ b/plumbing/storer/reference.go @@ -4,7 +4,7 @@ import ( "errors" "io" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) const MaxResolveRecursion = 1024 diff --git a/plumbing/storer/reference_test.go b/plumbing/storer/reference_test.go index 1d02c22..0660043 100644 --- a/plumbing/storer/reference_test.go +++ b/plumbing/storer/reference_test.go @@ -5,7 +5,7 @@ import ( "io" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type ReferenceSuite struct{} diff --git a/plumbing/storer/shallow.go b/plumbing/storer/shallow.go index 39aaaa5..39ef5ea 100644 --- a/plumbing/storer/shallow.go +++ b/plumbing/storer/shallow.go @@ -1,6 +1,6 @@ package storer -import "gopkg.in/src-d/go-git.v4/plumbing" +import "github.com/go-git/go-git/v5/plumbing" // ShallowStorer is a storage of references to shallow commits by hash, // meaning that these commits have missing parents because of a shallow fetch. diff --git a/plumbing/transport/client/client.go b/plumbing/transport/client/client.go index 90635a5..4f6d210 100644 --- a/plumbing/transport/client/client.go +++ b/plumbing/transport/client/client.go @@ -5,11 +5,11 @@ package client import ( "fmt" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/file" - "gopkg.in/src-d/go-git.v4/plumbing/transport/git" - "gopkg.in/src-d/go-git.v4/plumbing/transport/http" - "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/file" + "github.com/go-git/go-git/v5/plumbing/transport/git" + "github.com/go-git/go-git/v5/plumbing/transport/http" + "github.com/go-git/go-git/v5/plumbing/transport/ssh" ) // Protocols are the protocols supported by default. diff --git a/plumbing/transport/client/client_test.go b/plumbing/transport/client/client_test.go index 65cf574..9ebe113 100644 --- a/plumbing/transport/client/client_test.go +++ b/plumbing/transport/client/client_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/client/example_test.go b/plumbing/transport/client/example_test.go index 3e7a4f0..e1b3887 100644 --- a/plumbing/transport/client/example_test.go +++ b/plumbing/transport/client/example_test.go @@ -4,8 +4,8 @@ import ( "crypto/tls" "net/http" - "gopkg.in/src-d/go-git.v4/plumbing/transport/client" - githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http" + "github.com/go-git/go-git/v5/plumbing/transport/client" + githttp "github.com/go-git/go-git/v5/plumbing/transport/http" ) func ExampleInstallProtocol() { diff --git a/plumbing/transport/common.go b/plumbing/transport/common.go index dcf9391..ead2155 100644 --- a/plumbing/transport/common.go +++ b/plumbing/transport/common.go @@ -22,10 +22,10 @@ import ( "strconv" "strings" - giturl "gopkg.in/src-d/go-git.v4/internal/url" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + giturl "github.com/go-git/go-git/v5/internal/url" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" ) var ( diff --git a/plumbing/transport/common_test.go b/plumbing/transport/common_test.go index 65ed5b9..0c5a01a 100644 --- a/plumbing/transport/common_test.go +++ b/plumbing/transport/common_test.go @@ -5,7 +5,7 @@ import ( "net/url" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/file/client.go b/plumbing/transport/file/client.go index e799ee1..f6e2365 100644 --- a/plumbing/transport/file/client.go +++ b/plumbing/transport/file/client.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/internal/common" ) // DefaultClient is the default local client. diff --git a/plumbing/transport/file/client_test.go b/plumbing/transport/file/client_test.go index 25ea278..daa0871 100644 --- a/plumbing/transport/file/client_test.go +++ b/plumbing/transport/file/client_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/file/receive_pack_test.go b/plumbing/transport/file/receive_pack_test.go index 3e7b140..46a0017 100644 --- a/plumbing/transport/file/receive_pack_test.go +++ b/plumbing/transport/file/receive_pack_test.go @@ -3,7 +3,7 @@ package file import ( "os" - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/file/server.go b/plumbing/transport/file/server.go index 61dd42d..b45d7a7 100644 --- a/plumbing/transport/file/server.go +++ b/plumbing/transport/file/server.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common" - "gopkg.in/src-d/go-git.v4/plumbing/transport/server" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/internal/common" + "github.com/go-git/go-git/v5/plumbing/transport/server" + "github.com/go-git/go-git/v5/utils/ioutil" ) // ServeUploadPack serves a git-upload-pack request using standard output, input diff --git a/plumbing/transport/file/upload_pack_test.go b/plumbing/transport/file/upload_pack_test.go index 0b9b562..1f210aa 100644 --- a/plumbing/transport/file/upload_pack_test.go +++ b/plumbing/transport/file/upload_pack_test.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/git/common.go b/plumbing/transport/git/common.go index 78aaa3b..306aae2 100644 --- a/plumbing/transport/git/common.go +++ b/plumbing/transport/git/common.go @@ -6,10 +6,10 @@ import ( "io" "net" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/internal/common" + "github.com/go-git/go-git/v5/utils/ioutil" ) // DefaultClient is the default git client. diff --git a/plumbing/transport/git/common_test.go b/plumbing/transport/git/common_test.go index 61097e7..62eeef9 100644 --- a/plumbing/transport/git/common_test.go +++ b/plumbing/transport/git/common_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/git/receive_pack_test.go b/plumbing/transport/git/receive_pack_test.go index fa10735..44989a4 100644 --- a/plumbing/transport/git/receive_pack_test.go +++ b/plumbing/transport/git/receive_pack_test.go @@ -1,7 +1,7 @@ package git import ( - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/git/upload_pack_test.go b/plumbing/transport/git/upload_pack_test.go index 7058564..6d10363 100644 --- a/plumbing/transport/git/upload_pack_test.go +++ b/plumbing/transport/git/upload_pack_test.go @@ -1,7 +1,7 @@ package git import ( - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/http/common.go b/plumbing/transport/http/common.go index 16ff930..aeedc5b 100644 --- a/plumbing/transport/http/common.go +++ b/plumbing/transport/http/common.go @@ -9,10 +9,10 @@ import ( "strconv" "strings" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "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/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/utils/ioutil" ) // it requires a bytes.Buffer, because we need to know the length diff --git a/plumbing/transport/http/common_test.go b/plumbing/transport/http/common_test.go index d9e0636..d413558 100644 --- a/plumbing/transport/http/common_test.go +++ b/plumbing/transport/http/common_test.go @@ -15,7 +15,7 @@ import ( "strings" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/http/receive_pack.go b/plumbing/transport/http/receive_pack.go index 72ba0ec..433dfcf 100644 --- a/plumbing/transport/http/receive_pack.go +++ b/plumbing/transport/http/receive_pack.go @@ -7,12 +7,12 @@ import ( "io" "net/http" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/sideband" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "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/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/sideband" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/utils/ioutil" ) type rpSession struct { diff --git a/plumbing/transport/http/receive_pack_test.go b/plumbing/transport/http/receive_pack_test.go index abd69b3..24eaaba 100644 --- a/plumbing/transport/http/receive_pack_test.go +++ b/plumbing/transport/http/receive_pack_test.go @@ -1,7 +1,7 @@ package http import ( - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/http/upload_pack.go b/plumbing/transport/http/upload_pack.go index fb5ac36..db37089 100644 --- a/plumbing/transport/http/upload_pack.go +++ b/plumbing/transport/http/upload_pack.go @@ -7,12 +7,12 @@ import ( "io" "net/http" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common" - "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/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/internal/common" + "github.com/go-git/go-git/v5/utils/ioutil" ) type upSession struct { diff --git a/plumbing/transport/http/upload_pack_test.go b/plumbing/transport/http/upload_pack_test.go index 3b85af5..4fc2912 100644 --- a/plumbing/transport/http/upload_pack_test.go +++ b/plumbing/transport/http/upload_pack_test.go @@ -6,10 +6,10 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/internal/common/common.go b/plumbing/transport/internal/common/common.go index cb1b6da..d564d25 100644 --- a/plumbing/transport/internal/common/common.go +++ b/plumbing/transport/internal/common/common.go @@ -15,12 +15,12 @@ import ( "strings" "time" - "gopkg.in/src-d/go-git.v4/plumbing/format/pktline" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/sideband" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/format/pktline" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/sideband" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/utils/ioutil" ) const ( diff --git a/plumbing/transport/internal/common/server.go b/plumbing/transport/internal/common/server.go index f4ca692..e248084 100644 --- a/plumbing/transport/internal/common/server.go +++ b/plumbing/transport/internal/common/server.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/utils/ioutil" ) // ServerCommand is used for a single server command execution. diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go index 13b3526..e7e2b07 100644 --- a/plumbing/transport/server/loader.go +++ b/plumbing/transport/server/loader.go @@ -1,13 +1,13 @@ package server import ( - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/storage/filesystem" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/storage/filesystem" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/osfs" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/osfs" ) // DefaultLoader is a filesystem loader ignoring host and resolving paths to /. diff --git a/plumbing/transport/server/loader_test.go b/plumbing/transport/server/loader_test.go index f35511d..88f0403 100644 --- a/plumbing/transport/server/loader_test.go +++ b/plumbing/transport/server/loader_test.go @@ -4,8 +4,8 @@ import ( "os/exec" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/server/receive_pack_test.go b/plumbing/transport/server/receive_pack_test.go index 39fa979..de072f3 100644 --- a/plumbing/transport/server/receive_pack_test.go +++ b/plumbing/transport/server/receive_pack_test.go @@ -1,7 +1,7 @@ package server_test import ( - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/server/server.go b/plumbing/transport/server/server.go index 8e0dcc1..71845e3 100644 --- a/plumbing/transport/server/server.go +++ b/plumbing/transport/server/server.go @@ -8,14 +8,14 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/revlist" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "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/format/packfile" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/revlist" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/utils/ioutil" ) var DefaultServer = NewServer(DefaultLoader) diff --git a/plumbing/transport/server/server_test.go b/plumbing/transport/server/server_test.go index 302ff48..ab03ca0 100644 --- a/plumbing/transport/server/server_test.go +++ b/plumbing/transport/server/server_test.go @@ -3,13 +3,13 @@ package server_test import ( "testing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/client" - "gopkg.in/src-d/go-git.v4/plumbing/transport/server" - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" - "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/cache" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/client" + "github.com/go-git/go-git/v5/plumbing/transport/server" + "github.com/go-git/go-git/v5/plumbing/transport/test" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/server/upload_pack_test.go b/plumbing/transport/server/upload_pack_test.go index f252a75..cf91ffa 100644 --- a/plumbing/transport/server/upload_pack_test.go +++ b/plumbing/transport/server/upload_pack_test.go @@ -1,7 +1,7 @@ package server_test import ( - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/ssh/auth_method.go b/plumbing/transport/ssh/auth_method.go index 1e5c383..b79a74e 100644 --- a/plumbing/transport/ssh/auth_method.go +++ b/plumbing/transport/ssh/auth_method.go @@ -10,7 +10,7 @@ import ( "os/user" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" "github.com/mitchellh/go-homedir" "github.com/xanzy/ssh-agent" diff --git a/plumbing/transport/ssh/common.go b/plumbing/transport/ssh/common.go index d320d43..c05ded9 100644 --- a/plumbing/transport/ssh/common.go +++ b/plumbing/transport/ssh/common.go @@ -7,8 +7,8 @@ import ( "reflect" "strconv" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/internal/common" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/internal/common" "github.com/kevinburke/ssh_config" "golang.org/x/crypto/ssh" diff --git a/plumbing/transport/ssh/common_test.go b/plumbing/transport/ssh/common_test.go index 6e76096..22a8243 100644 --- a/plumbing/transport/ssh/common_test.go +++ b/plumbing/transport/ssh/common_test.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/ssh" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport" ) func Test(t *testing.T) { TestingT(t) } diff --git a/plumbing/transport/ssh/upload_pack_test.go b/plumbing/transport/ssh/upload_pack_test.go index 2685ff0..aa7344d 100644 --- a/plumbing/transport/ssh/upload_pack_test.go +++ b/plumbing/transport/ssh/upload_pack_test.go @@ -12,8 +12,8 @@ import ( "strings" "sync" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/test" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/test" "github.com/gliderlabs/ssh" stdssh "golang.org/x/crypto/ssh" diff --git a/plumbing/transport/test/receive_pack.go b/plumbing/transport/test/receive_pack.go index 8dcde8b..01972b2 100644 --- a/plumbing/transport/test/receive_pack.go +++ b/plumbing/transport/test/receive_pack.go @@ -11,12 +11,12 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "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/format/packfile" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/plumbing/transport/test/upload_pack.go b/plumbing/transport/test/upload_pack.go index 8709ac2..ee7b067 100644 --- a/plumbing/transport/test/upload_pack.go +++ b/plumbing/transport/test/upload_pack.go @@ -10,14 +10,14 @@ import ( "io/ioutil" "time" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "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/format/packfile" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" ) type UploadPackSuite struct { @@ -4,8 +4,8 @@ import ( "errors" "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" ) type PruneHandler func(unreferencedObjectHash plumbing.Hash) error diff --git a/prune_test.go b/prune_test.go index 2279636..418c285 100644 --- a/prune_test.go +++ b/prune_test.go @@ -3,11 +3,11 @@ package git import ( "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/storer" - "gopkg.in/src-d/go-git.v4/storage" - "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/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/references.go b/references.go index 5673ac1..6d96035 100644 --- a/references.go +++ b/references.go @@ -4,9 +4,9 @@ import ( "io" "sort" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "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/object" + "github.com/go-git/go-git/v5/utils/diff" "github.com/sergi/go-diff/diffmatchpatch" ) diff --git a/references_test.go b/references_test.go index 6e75563..31715e6 100644 --- a/references_test.go +++ b/references_test.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "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/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/storage/memory" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" @@ -6,23 +6,23 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-billy.v4/osfs" - "gopkg.in/src-d/go-git.v4/config" - "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/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/sideband" - "gopkg.in/src-d/go-git.v4/plumbing/revlist" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/plumbing/transport/client" - "gopkg.in/src-d/go-git.v4/storage" - "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/ioutil" + "github.com/go-git/go-billy/v5/osfs" + "github.com/go-git/go-git/v5/config" + "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/packfile" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/sideband" + "github.com/go-git/go-git/v5/plumbing/revlist" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/plumbing/transport/client" + "github.com/go-git/go-git/v5/storage" + "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/ioutil" ) var ( diff --git a/remote_test.go b/remote_test.go index a45d814..1e094b0 100644 --- a/remote_test.go +++ b/remote_test.go @@ -9,18 +9,18 @@ import ( "runtime" "time" - "gopkg.in/src-d/go-git.v4/config" - "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/protocol/packp" - "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp/capability" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" - "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/config" + "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/protocol/packp" + "github.com/go-git/go-git/v5/plumbing/protocol/packp/capability" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" + + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" fixtures "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/repository.go b/repository.go index 1e3e339..c83a136 100644 --- a/repository.go +++ b/repository.go @@ -14,19 +14,19 @@ import ( "time" "golang.org/x/crypto/openpgp" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/internal/revision" - "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/packfile" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/utils/ioutil" - - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/osfs" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/internal/revision" + "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/packfile" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/utils/ioutil" + + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/osfs" ) // GitDirName this is a special folder where all the git stuff is. diff --git a/repository_test.go b/repository_test.go index 06b748a..8df8019 100644 --- a/repository_test.go +++ b/repository_test.go @@ -21,20 +21,20 @@ import ( "golang.org/x/crypto/openpgp/armor" openpgperr "golang.org/x/crypto/openpgp/errors" - "gopkg.in/src-d/go-git.v4/config" - "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/object" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/plumbing/transport" - "gopkg.in/src-d/go-git.v4/storage" - "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/config" + "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/object" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/transport" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem" + "github.com/go-git/go-git/v5/storage/memory" + + "github.com/go-git/go-billy/v5/memfs" + "github.com/go-git/go-billy/v5/osfs" + "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/osfs" - "gopkg.in/src-d/go-billy.v4/util" ) type RepositorySuite struct { @@ -2680,9 +2680,9 @@ func (s *RepositorySuite) TestResolveRevisionWithErrors(c *C) { c.Assert(err, IsNil) datas := map[string]string{ - "efs/heads/master~": "reference not found", - "HEAD^3": `Revision invalid : "3" found must be 0, 1 or 2 after "^"`, - "HEAD^{/whatever}": `No commit message match regexp : "whatever"`, + "efs/heads/master~": "reference not found", + "HEAD^3": `Revision invalid : "3" found must be 0, 1 or 2 after "^"`, + "HEAD^{/whatever}": `No commit message match regexp : "whatever"`, "4e1243bd22c66e76c2ba9eddc1f91394e57f9f83": "reference not found", } diff --git a/storage/filesystem/config.go b/storage/filesystem/config.go index be812e4..01b35b4 100644 --- a/storage/filesystem/config.go +++ b/storage/filesystem/config.go @@ -4,9 +4,9 @@ import ( stdioutil "io/ioutil" "os" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" ) type ConfigStorage struct { diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 71c947d..89d4210 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -4,11 +4,11 @@ import ( "io/ioutil" "os" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/storage/filesystem/deltaobject.go b/storage/filesystem/deltaobject.go index 66cfb71..6ab2cdf 100644 --- a/storage/filesystem/deltaobject.go +++ b/storage/filesystem/deltaobject.go @@ -1,7 +1,7 @@ package filesystem import ( - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) type deltaObject struct { diff --git a/storage/filesystem/dotgit/dotgit.go b/storage/filesystem/dotgit/dotgit.go index 7989e53..3ce9dae 100644 --- a/storage/filesystem/dotgit/dotgit.go +++ b/storage/filesystem/dotgit/dotgit.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "gopkg.in/src-d/go-billy.v4/osfs" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-billy/v5/osfs" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/utils/ioutil" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) const ( diff --git a/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go b/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go index 7f1c02c..43263ea 100644 --- a/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go +++ b/storage/filesystem/dotgit/dotgit_rewrite_packed_refs.go @@ -5,8 +5,8 @@ import ( "os" "runtime" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/utils/ioutil" ) func (d *DotGit) openAndLockPackedRefsMode() int { diff --git a/storage/filesystem/dotgit/dotgit_setref.go b/storage/filesystem/dotgit/dotgit_setref.go index 9da2f31..c057f5c 100644 --- a/storage/filesystem/dotgit/dotgit_setref.go +++ b/storage/filesystem/dotgit/dotgit_setref.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/utils/ioutil" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) func (d *DotGit) setRef(fileName, content string, old *plumbing.Reference) (err error) { diff --git a/storage/filesystem/dotgit/dotgit_test.go b/storage/filesystem/dotgit/dotgit_test.go index bd4e9f0..87b702d 100644 --- a/storage/filesystem/dotgit/dotgit_test.go +++ b/storage/filesystem/dotgit/dotgit_test.go @@ -9,11 +9,11 @@ import ( "strings" "testing" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/storage/filesystem/dotgit/writers.go b/storage/filesystem/dotgit/writers.go index 93d2d8c..e2ede93 100644 --- a/storage/filesystem/dotgit/writers.go +++ b/storage/filesystem/dotgit/writers.go @@ -5,12 +5,12 @@ import ( "io" "sync/atomic" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" - "gopkg.in/src-d/go-git.v4/plumbing/format/objfile" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/objfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) // PackWriter is a io.Writer that generates the packfile index simultaneously, diff --git a/storage/filesystem/dotgit/writers_test.go b/storage/filesystem/dotgit/writers_test.go index 5a5f7b4..8d3b797 100644 --- a/storage/filesystem/dotgit/writers_test.go +++ b/storage/filesystem/dotgit/writers_test.go @@ -8,12 +8,12 @@ import ( "os" "strconv" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/idxfile" - "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/packfile" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/osfs" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/storage/filesystem/index.go b/storage/filesystem/index.go index be800ef..a19176f 100644 --- a/storage/filesystem/index.go +++ b/storage/filesystem/index.go @@ -4,9 +4,9 @@ import ( "bufio" "os" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" ) type IndexStorage struct { diff --git a/storage/filesystem/module.go b/storage/filesystem/module.go index 9272206..20336c1 100644 --- a/storage/filesystem/module.go +++ b/storage/filesystem/module.go @@ -1,9 +1,9 @@ package filesystem import ( - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" ) type ModuleStorage struct { diff --git a/storage/filesystem/object.go b/storage/filesystem/object.go index ad5d8d0..862cc1b 100644 --- a/storage/filesystem/object.go +++ b/storage/filesystem/object.go @@ -5,16 +5,16 @@ import ( "os" "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/format/idxfile" - "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-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" - - "gopkg.in/src-d/go-billy.v4" + "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/idxfile" + "github.com/go-git/go-git/v5/plumbing/format/objfile" + "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/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" + + "github.com/go-git/go-billy/v5" ) type ObjectStorage struct { diff --git a/storage/filesystem/object_test.go b/storage/filesystem/object_test.go index c2461db..f9a6a76 100644 --- a/storage/filesystem/object_test.go +++ b/storage/filesystem/object_test.go @@ -8,9 +8,9 @@ import ( "path/filepath" "testing" - "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/dotgit" + "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/dotgit" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/storage/filesystem/reference.go b/storage/filesystem/reference.go index a891b83..aabcd73 100644 --- a/storage/filesystem/reference.go +++ b/storage/filesystem/reference.go @@ -1,9 +1,9 @@ package filesystem import ( - "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/filesystem/dotgit" + "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/filesystem/dotgit" ) type ReferenceStorage struct { diff --git a/storage/filesystem/shallow.go b/storage/filesystem/shallow.go index 502d406..afb600c 100644 --- a/storage/filesystem/shallow.go +++ b/storage/filesystem/shallow.go @@ -4,9 +4,9 @@ import ( "bufio" "fmt" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" - "gopkg.in/src-d/go-git.v4/utils/ioutil" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/utils/ioutil" ) // ShallowStorage where the shallow commits are stored, an internal to diff --git a/storage/filesystem/storage.go b/storage/filesystem/storage.go index 88d1ed4..8b69b27 100644 --- a/storage/filesystem/storage.go +++ b/storage/filesystem/storage.go @@ -2,10 +2,10 @@ package filesystem import ( - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/storage/filesystem/dotgit" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/storage/filesystem/dotgit" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) // 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 6fa0d90..2c7c690 100644 --- a/storage/filesystem/storage_test.go +++ b/storage/filesystem/storage_test.go @@ -4,13 +4,13 @@ import ( "io/ioutil" "testing" - "gopkg.in/src-d/go-git.v4/plumbing/cache" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage/test" + "github.com/go-git/go-git/v5/plumbing/cache" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage/test" + "github.com/go-git/go-billy/v5/memfs" + "github.com/go-git/go-billy/v5/osfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-billy.v4/osfs" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/memory/storage.go b/storage/memory/storage.go index fee8266..fdf8fcf 100644 --- a/storage/memory/storage.go +++ b/storage/memory/storage.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" ) var ErrUnsupportedObjectType = fmt.Errorf("unsupported object type") diff --git a/storage/memory/storage_test.go b/storage/memory/storage_test.go index 31a27fa..85c7859 100644 --- a/storage/memory/storage_test.go +++ b/storage/memory/storage_test.go @@ -4,7 +4,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/storage/test" + "github.com/go-git/go-git/v5/storage/test" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/storer.go b/storage/storer.go index 5de0cfb..4800ac7 100644 --- a/storage/storer.go +++ b/storage/storer.go @@ -3,14 +3,14 @@ package storage import ( "errors" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing/storer" ) var ErrReferenceHasChanged = errors.New("reference has changed concurrently") // Storer is a generic storage of objects, references and any information -// related to a particular repository. The package gopkg.in/src-d/go-git.v4/storage +// related to a particular repository. The package github.com/go-git/go-git/v5/storage // contains two implementation a filesystem base implementation (such as `.git`) // and a memory implementations being ephemeral type Storer interface { diff --git a/storage/test/storage_suite.go b/storage/test/storage_suite.go index e050b73..a483a79 100644 --- a/storage/test/storage_suite.go +++ b/storage/test/storage_suite.go @@ -7,11 +7,11 @@ import ( "io" "io/ioutil" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/storage" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/storage" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/storage/transactional/config.go b/storage/transactional/config.go index 4d8efe1..f8c3cc2 100644 --- a/storage/transactional/config.go +++ b/storage/transactional/config.go @@ -1,6 +1,6 @@ package transactional -import "gopkg.in/src-d/go-git.v4/config" +import "github.com/go-git/go-git/v5/config" // ConfigStorage implements the storer.ConfigStorage for the transactional package. type ConfigStorage struct { diff --git a/storage/transactional/config_test.go b/storage/transactional/config_test.go index 5d1e019..ec7ae89 100644 --- a/storage/transactional/config_test.go +++ b/storage/transactional/config_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ConfigSuite{}) diff --git a/storage/transactional/index.go b/storage/transactional/index.go index 84e0e2f..70641ac 100644 --- a/storage/transactional/index.go +++ b/storage/transactional/index.go @@ -1,8 +1,8 @@ package transactional import ( - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/storer" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/storer" ) // IndexStorage implements the storer.IndexStorage for the transactional package. diff --git a/storage/transactional/index_test.go b/storage/transactional/index_test.go index e1c571a..88fa1f5 100644 --- a/storage/transactional/index_test.go +++ b/storage/transactional/index_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&IndexSuite{}) diff --git a/storage/transactional/object.go b/storage/transactional/object.go index beb63d6..5d102b0 100644 --- a/storage/transactional/object.go +++ b/storage/transactional/object.go @@ -1,8 +1,8 @@ package transactional import ( - "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" ) // ObjectStorage implements the storer.EncodedObjectStorer for the transactional package. diff --git a/storage/transactional/object_test.go b/storage/transactional/object_test.go index 10b6318..e634409 100644 --- a/storage/transactional/object_test.go +++ b/storage/transactional/object_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ObjectSuite{}) diff --git a/storage/transactional/reference.go b/storage/transactional/reference.go index a7be532..c3a727c 100644 --- a/storage/transactional/reference.go +++ b/storage/transactional/reference.go @@ -1,9 +1,9 @@ package transactional import ( - "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" ) // ReferenceStorage implements the storer.ReferenceStorage for the transactional package. diff --git a/storage/transactional/reference_test.go b/storage/transactional/reference_test.go index 5793549..a6bd1ce 100644 --- a/storage/transactional/reference_test.go +++ b/storage/transactional/reference_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ReferenceSuite{}) diff --git a/storage/transactional/shallow.go b/storage/transactional/shallow.go index bedc325..20b930e 100644 --- a/storage/transactional/shallow.go +++ b/storage/transactional/shallow.go @@ -1,8 +1,8 @@ package transactional import ( - "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" ) // ShallowStorage implements the storer.ShallowStorer for the transactional package. diff --git a/storage/transactional/shallow_test.go b/storage/transactional/shallow_test.go index 5141782..1209fe6 100644 --- a/storage/transactional/shallow_test.go +++ b/storage/transactional/shallow_test.go @@ -2,8 +2,8 @@ package transactional import ( . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/storage/memory" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" ) var _ = Suite(&ShallowSuite{}) diff --git a/storage/transactional/storage.go b/storage/transactional/storage.go index b81b104..d4c68cb 100644 --- a/storage/transactional/storage.go +++ b/storage/transactional/storage.go @@ -3,8 +3,8 @@ package transactional import ( "io" - "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/storer" + "github.com/go-git/go-git/v5/storage" ) // Storage is a transactional implementation of git.Storer, it demux the write diff --git a/storage/transactional/storage_test.go b/storage/transactional/storage_test.go index 63ebfb1..41d656b 100644 --- a/storage/transactional/storage_test.go +++ b/storage/transactional/storage_test.go @@ -3,15 +3,15 @@ package transactional import ( "testing" + "github.com/go-git/go-billy/v5/memfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "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/storer" - "gopkg.in/src-d/go-git.v4/storage" - "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/storage/test" + "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/storer" + "github.com/go-git/go-git/v5/storage" + "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/storage/test" ) func Test(t *testing.T) { TestingT(t) } diff --git a/submodule.go b/submodule.go index a4eb7de..92ccdb1 100644 --- a/submodule.go +++ b/submodule.go @@ -6,10 +6,10 @@ import ( "errors" "fmt" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-git.v4/config" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-git/v5/config" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/format/index" ) var ( diff --git a/submodule_test.go b/submodule_test.go index 2c0a2ed..335786b 100644 --- a/submodule_test.go +++ b/submodule_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" . "gopkg.in/check.v1" "gopkg.in/src-d/go-git-fixtures.v3" diff --git a/utils/binary/read.go b/utils/binary/read.go index 12e57c3..a14d48d 100644 --- a/utils/binary/read.go +++ b/utils/binary/read.go @@ -7,7 +7,7 @@ import ( "encoding/binary" "io" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) // Read reads structured binary data from r into data. Bytes are read and diff --git a/utils/binary/read_test.go b/utils/binary/read_test.go index 22867c2..3749258 100644 --- a/utils/binary/read_test.go +++ b/utils/binary/read_test.go @@ -7,7 +7,7 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" + "github.com/go-git/go-git/v5/plumbing" ) func Test(t *testing.T) { TestingT(t) } diff --git a/utils/diff/diff_ext_test.go b/utils/diff/diff_ext_test.go index c6c7e90..2eea275 100644 --- a/utils/diff/diff_ext_test.go +++ b/utils/diff/diff_ext_test.go @@ -3,7 +3,7 @@ package diff_test import ( "testing" - "gopkg.in/src-d/go-git.v4/utils/diff" + "github.com/go-git/go-git/v5/utils/diff" "github.com/sergi/go-diff/diffmatchpatch" . "gopkg.in/check.v1" diff --git a/utils/merkletrie/change.go b/utils/merkletrie/change.go index 0b50ca7..cc6dc89 100644 --- a/utils/merkletrie/change.go +++ b/utils/merkletrie/change.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // Action values represent the kind of things a Change can represent: diff --git a/utils/merkletrie/change_test.go b/utils/merkletrie/change_test.go index c849f5f..f73eb86 100644 --- a/utils/merkletrie/change_test.go +++ b/utils/merkletrie/change_test.go @@ -1,9 +1,9 @@ package merkletrie_test import ( - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder" - "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/internal/fsnoder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" ) diff --git a/utils/merkletrie/difftree.go b/utils/merkletrie/difftree.go index 77ba5a8..90d9c95 100644 --- a/utils/merkletrie/difftree.go +++ b/utils/merkletrie/difftree.go @@ -252,7 +252,7 @@ import ( "errors" "fmt" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) var ( diff --git a/utils/merkletrie/difftree_test.go b/utils/merkletrie/difftree_test.go index f725bcf..c3937bf 100644 --- a/utils/merkletrie/difftree_test.go +++ b/utils/merkletrie/difftree_test.go @@ -10,8 +10,8 @@ import ( "testing" "unicode" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder" + "github.com/go-git/go-git/v5/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/internal/fsnoder" . "gopkg.in/check.v1" ) diff --git a/utils/merkletrie/doubleiter.go b/utils/merkletrie/doubleiter.go index e56dee7..4a4341b 100644 --- a/utils/merkletrie/doubleiter.go +++ b/utils/merkletrie/doubleiter.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // A doubleIter is a convenience type to keep track of the current diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go index 12d0018..165bd42 100644 --- a/utils/merkletrie/filesystem/node.go +++ b/utils/merkletrie/filesystem/node.go @@ -5,11 +5,11 @@ import ( "os" "path" - "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" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) var ignore = map[string]bool{ diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go index 12f3412..0f6ebe0 100644 --- a/utils/merkletrie/filesystem/node_test.go +++ b/utils/merkletrie/filesystem/node_test.go @@ -7,12 +7,12 @@ import ( "path" "testing" + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/memfs" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-git.v4/plumbing" - "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/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) func Test(t *testing.T) { TestingT(t) } diff --git a/utils/merkletrie/index/node.go b/utils/merkletrie/index/node.go index 9622622..d05b0c6 100644 --- a/utils/merkletrie/index/node.go +++ b/utils/merkletrie/index/node.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // The node represents a index.Entry or a directory inferred from the path diff --git a/utils/merkletrie/index/node_test.go b/utils/merkletrie/index/node_test.go index 283ca74..4fa6c63 100644 --- a/utils/merkletrie/index/node_test.go +++ b/utils/merkletrie/index/node_test.go @@ -6,10 +6,10 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git.v4/plumbing" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "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/format/index" + "github.com/go-git/go-git/v5/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) func Test(t *testing.T) { TestingT(t) } diff --git a/utils/merkletrie/internal/frame/frame.go b/utils/merkletrie/internal/frame/frame.go index 77a3de4..131878a 100644 --- a/utils/merkletrie/internal/frame/frame.go +++ b/utils/merkletrie/internal/frame/frame.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // A Frame is a collection of siblings in a trie, sorted alphabetically diff --git a/utils/merkletrie/internal/frame/frame_test.go b/utils/merkletrie/internal/frame/frame_test.go index 7d74b1e..0544c8b 100644 --- a/utils/merkletrie/internal/frame/frame_test.go +++ b/utils/merkletrie/internal/frame/frame_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/internal/fsnoder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" ) diff --git a/utils/merkletrie/internal/fsnoder/dir.go b/utils/merkletrie/internal/fsnoder/dir.go index 1811de9..20a2aee 100644 --- a/utils/merkletrie/internal/fsnoder/dir.go +++ b/utils/merkletrie/internal/fsnoder/dir.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // Dir values implement directory-like noders. diff --git a/utils/merkletrie/internal/fsnoder/dir_test.go b/utils/merkletrie/internal/fsnoder/dir_test.go index df5aacc..1a6ea03 100644 --- a/utils/merkletrie/internal/fsnoder/dir_test.go +++ b/utils/merkletrie/internal/fsnoder/dir_test.go @@ -4,7 +4,7 @@ import ( "reflect" "sort" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" ) diff --git a/utils/merkletrie/internal/fsnoder/file.go b/utils/merkletrie/internal/fsnoder/file.go index 686a675..d53643f 100644 --- a/utils/merkletrie/internal/fsnoder/file.go +++ b/utils/merkletrie/internal/fsnoder/file.go @@ -5,7 +5,7 @@ import ( "fmt" "hash/fnv" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // file values represent file-like noders in a merkle trie. diff --git a/utils/merkletrie/internal/fsnoder/file_test.go b/utils/merkletrie/internal/fsnoder/file_test.go index 730ae7c..b949b53 100644 --- a/utils/merkletrie/internal/fsnoder/file_test.go +++ b/utils/merkletrie/internal/fsnoder/file_test.go @@ -3,7 +3,7 @@ package fsnoder import ( "testing" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" ) diff --git a/utils/merkletrie/internal/fsnoder/new.go b/utils/merkletrie/internal/fsnoder/new.go index ab749fd..b5389c7 100644 --- a/utils/merkletrie/internal/fsnoder/new.go +++ b/utils/merkletrie/internal/fsnoder/new.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // New function creates a full merkle trie from the string description of diff --git a/utils/merkletrie/internal/fsnoder/new_test.go b/utils/merkletrie/internal/fsnoder/new_test.go index a2c474a..ad069c7 100644 --- a/utils/merkletrie/internal/fsnoder/new_test.go +++ b/utils/merkletrie/internal/fsnoder/new_test.go @@ -1,7 +1,7 @@ package fsnoder import ( - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" ) diff --git a/utils/merkletrie/iter.go b/utils/merkletrie/iter.go index b4d4c99..d75afec 100644 --- a/utils/merkletrie/iter.go +++ b/utils/merkletrie/iter.go @@ -4,8 +4,8 @@ import ( "fmt" "io" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/frame" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-git/v5/utils/merkletrie/internal/frame" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) // Iter is an iterator for merkletries (only the trie part of the diff --git a/utils/merkletrie/iter_test.go b/utils/merkletrie/iter_test.go index 3b24043..ad6639b 100644 --- a/utils/merkletrie/iter_test.go +++ b/utils/merkletrie/iter_test.go @@ -5,9 +5,9 @@ import ( "io" "strings" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/fsnoder" - "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/internal/fsnoder" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" . "gopkg.in/check.v1" ) diff --git a/worktree.go b/worktree.go index 4a609e9..7f394d4 100644 --- a/worktree.go +++ b/worktree.go @@ -11,18 +11,18 @@ import ( "strings" "sync" - "gopkg.in/src-d/go-git.v4/config" - "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/format/gitignore" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/plumbing/storer" - "gopkg.in/src-d/go-git.v4/utils/ioutil" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - - "gopkg.in/src-d/go-billy.v4" - "gopkg.in/src-d/go-billy.v4/util" + "github.com/go-git/go-git/v5/config" + "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/format/gitignore" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/plumbing/storer" + "github.com/go-git/go-git/v5/utils/ioutil" + "github.com/go-git/go-git/v5/utils/merkletrie" + + "github.com/go-git/go-billy/v5" + "github.com/go-git/go-billy/v5/util" ) var ( diff --git a/worktree_bsd.go b/worktree_bsd.go index 9ff670e..d4ea327 100644 --- a/worktree_bsd.go +++ b/worktree_bsd.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/format/index" ) func init() { diff --git a/worktree_commit.go b/worktree_commit.go index 673eb16..63eb2e8 100644 --- a/worktree_commit.go +++ b/worktree_commit.go @@ -7,13 +7,13 @@ import ( "strings" "golang.org/x/crypto/openpgp" - "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/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/storage" + "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/format/index" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/storage" - "gopkg.in/src-d/go-billy.v4" + "github.com/go-git/go-billy/v5" ) // Commit stores the current contents of the index in a new commit along with diff --git a/worktree_commit_test.go b/worktree_commit_test.go index 5bcbac9..aeb4a9a 100644 --- a/worktree_commit_test.go +++ b/worktree_commit_test.go @@ -8,20 +8,20 @@ import ( "strings" "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/object" - "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" - + "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/object" + "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-billy/v5/memfs" + "github.com/go-git/go-billy/v5/osfs" + "github.com/go-git/go-billy/v5/util" "golang.org/x/crypto/openpgp" "golang.org/x/crypto/openpgp/armor" "golang.org/x/crypto/openpgp/errors" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-billy.v4/osfs" - "gopkg.in/src-d/go-billy.v4/util" ) func (s *WorktreeSuite) TestCommitInvalidOptions(c *C) { diff --git a/worktree_linux.go b/worktree_linux.go index 891cb1c..cf0db25 100644 --- a/worktree_linux.go +++ b/worktree_linux.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/format/index" ) func init() { diff --git a/worktree_plan9.go b/worktree_plan9.go index 16d3915..8cedf71 100644 --- a/worktree_plan9.go +++ b/worktree_plan9.go @@ -4,7 +4,7 @@ import ( "syscall" "time" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/format/index" ) func init() { diff --git a/worktree_status.go b/worktree_status.go index 16ce937..1542f5e 100644 --- a/worktree_status.go +++ b/worktree_status.go @@ -8,17 +8,17 @@ import ( "path" "path/filepath" - "gopkg.in/src-d/go-billy.v4/util" - "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/format/gitignore" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "gopkg.in/src-d/go-git.v4/plumbing/object" - "gopkg.in/src-d/go-git.v4/utils/ioutil" - "gopkg.in/src-d/go-git.v4/utils/merkletrie" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/filesystem" - mindex "gopkg.in/src-d/go-git.v4/utils/merkletrie/index" - "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" + "github.com/go-git/go-billy/v5/util" + "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/format/gitignore" + "github.com/go-git/go-git/v5/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/object" + "github.com/go-git/go-git/v5/utils/ioutil" + "github.com/go-git/go-git/v5/utils/merkletrie" + "github.com/go-git/go-git/v5/utils/merkletrie/filesystem" + mindex "github.com/go-git/go-git/v5/utils/merkletrie/index" + "github.com/go-git/go-git/v5/utils/merkletrie/noder" ) var ( diff --git a/worktree_test.go b/worktree_test.go index dab1c23..1d8b7d3 100644 --- a/worktree_test.go +++ b/worktree_test.go @@ -12,19 +12,19 @@ import ( "testing" "time" - "gopkg.in/src-d/go-git.v4/config" - "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/format/gitignore" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" - "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/config" + "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/format/gitignore" + "github.com/go-git/go-git/v5/plumbing/format/index" + "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/osfs" + "github.com/go-git/go-billy/v5/util" "golang.org/x/text/unicode/norm" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v4/memfs" - "gopkg.in/src-d/go-billy.v4/osfs" - "gopkg.in/src-d/go-billy.v4/util" "gopkg.in/src-d/go-git-fixtures.v3" ) diff --git a/worktree_unix_other.go b/worktree_unix_other.go index d632767..f45966b 100644 --- a/worktree_unix_other.go +++ b/worktree_unix_other.go @@ -6,7 +6,7 @@ import ( "syscall" "time" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/format/index" ) func init() { diff --git a/worktree_windows.go b/worktree_windows.go index 1bef6f7..1928f97 100644 --- a/worktree_windows.go +++ b/worktree_windows.go @@ -7,7 +7,7 @@ import ( "syscall" "time" - "gopkg.in/src-d/go-git.v4/plumbing/format/index" + "github.com/go-git/go-git/v5/plumbing/format/index" ) func init() { |