diff options
27 files changed, 39 insertions, 37 deletions
@@ -62,8 +62,8 @@ GOLANGCI_LINT_VERSION ?= 1.33.0 PROTOC_VERSION ?= 3.12.4 PROTOC_GEN_GO_VERSION ?= 1.3.2 GIT_VERSION ?= v2.29.0 -GIT2GO_VERSION ?= v30 -LIBGIT2_VERSION ?= v1.0.1 +GIT2GO_VERSION ?= v31 +LIBGIT2_VERSION ?= v1.1.0 GOCOVER_COBERTURA_VERSION ?= aaee18c8195c3f2d90e5ef80ca918d265463842a # Dependency downloads @@ -5294,7 +5294,7 @@ The above copyright notice and this permission notice shall be included in all c THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -LICENSE - github.com/libgit2/git2go/v30 +LICENSE - github.com/libgit2/git2go/v31 The MIT License Copyright (c) 2013 The git2go contributors diff --git a/cmd/gitaly-git2go/apply.go b/cmd/gitaly-git2go/apply.go index c4c6cd1d1..99405b4c7 100644 --- a/cmd/gitaly-git2go/apply.go +++ b/cmd/gitaly-git2go/apply.go @@ -15,7 +15,7 @@ import ( "os/exec" "path/filepath" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/cherry_pick.go b/cmd/gitaly-git2go/cherry_pick.go index b0aad7f3a..4cd122892 100644 --- a/cmd/gitaly-git2go/cherry_pick.go +++ b/cmd/gitaly-git2go/cherry_pick.go @@ -11,7 +11,7 @@ import ( "io" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/cherry_pick_test.go b/cmd/gitaly-git2go/cherry_pick_test.go index 84f2c6043..9cad461b1 100644 --- a/cmd/gitaly-git2go/cherry_pick_test.go +++ b/cmd/gitaly-git2go/cherry_pick_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper" diff --git a/cmd/gitaly-git2go/commit/change_file_mode.go b/cmd/gitaly-git2go/commit/change_file_mode.go index 17200ee37..3628e32f9 100644 --- a/cmd/gitaly-git2go/commit/change_file_mode.go +++ b/cmd/gitaly-git2go/commit/change_file_mode.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/commit.go b/cmd/gitaly-git2go/commit/commit.go index 3c80452d2..d6d0b9c5e 100644 --- a/cmd/gitaly-git2go/commit/commit.go +++ b/cmd/gitaly-git2go/commit/commit.go @@ -9,7 +9,7 @@ import ( "fmt" "io" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/create_directory.go b/cmd/gitaly-git2go/commit/create_directory.go index c7059c0a3..91ee783b2 100644 --- a/cmd/gitaly-git2go/commit/create_directory.go +++ b/cmd/gitaly-git2go/commit/create_directory.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/create_file.go b/cmd/gitaly-git2go/commit/create_file.go index 62bc6f61b..abf92fa8e 100644 --- a/cmd/gitaly-git2go/commit/create_file.go +++ b/cmd/gitaly-git2go/commit/create_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/delete_file.go b/cmd/gitaly-git2go/commit/delete_file.go index 0c9df3be6..7a5b2a97c 100644 --- a/cmd/gitaly-git2go/commit/delete_file.go +++ b/cmd/gitaly-git2go/commit/delete_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/move_file.go b/cmd/gitaly-git2go/commit/move_file.go index e9c115083..67ca05438 100644 --- a/cmd/gitaly-git2go/commit/move_file.go +++ b/cmd/gitaly-git2go/commit/move_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/update_file.go b/cmd/gitaly-git2go/commit/update_file.go index 0bf6e7514..31bacf4dd 100644 --- a/cmd/gitaly-git2go/commit/update_file.go +++ b/cmd/gitaly-git2go/commit/update_file.go @@ -3,7 +3,7 @@ package commit import ( - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/commit/validate.go b/cmd/gitaly-git2go/commit/validate.go index 8854cdbbe..7506ee2a9 100644 --- a/cmd/gitaly-git2go/commit/validate.go +++ b/cmd/gitaly-git2go/commit/validate.go @@ -5,7 +5,7 @@ package commit import ( "os" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/conflicts/conflicts.go b/cmd/gitaly-git2go/conflicts/conflicts.go index 976795e17..adce309e2 100644 --- a/cmd/gitaly-git2go/conflicts/conflicts.go +++ b/cmd/gitaly-git2go/conflicts/conflicts.go @@ -10,7 +10,7 @@ import ( "io" "os" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" "gitlab.com/gitlab-org/gitaly/internal/helper" "google.golang.org/grpc/codes" diff --git a/cmd/gitaly-git2go/conflicts/conflicts_test.go b/cmd/gitaly-git2go/conflicts/conflicts_test.go index 74a70df3d..7f9d483c8 100644 --- a/cmd/gitaly-git2go/conflicts/conflicts_test.go +++ b/cmd/gitaly-git2go/conflicts/conflicts_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "github.com/stretchr/testify/require" cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper" "gitlab.com/gitlab-org/gitaly/internal/git/gittest" diff --git a/cmd/gitaly-git2go/merge.go b/cmd/gitaly-git2go/merge.go index dc9efd808..76f631d79 100644 --- a/cmd/gitaly-git2go/merge.go +++ b/cmd/gitaly-git2go/merge.go @@ -11,7 +11,7 @@ import ( "os" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/conflicts" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/merge_test.go b/cmd/gitaly-git2go/merge_test.go index 99e807dc5..a05412464 100644 --- a/cmd/gitaly-git2go/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper" diff --git a/cmd/gitaly-git2go/resolve_conflicts.go b/cmd/gitaly-git2go/resolve_conflicts.go index 4e4b69ddb..bde204273 100644 --- a/cmd/gitaly-git2go/resolve_conflicts.go +++ b/cmd/gitaly-git2go/resolve_conflicts.go @@ -13,7 +13,7 @@ import ( "strings" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git/conflict" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/revert.go b/cmd/gitaly-git2go/revert.go index d3ba942f7..8011ef5ae 100644 --- a/cmd/gitaly-git2go/revert.go +++ b/cmd/gitaly-git2go/revert.go @@ -10,7 +10,7 @@ import ( "fmt" "io" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/revert_test.go b/cmd/gitaly-git2go/revert_test.go index cf58a0d09..211feabc0 100644 --- a/cmd/gitaly-git2go/revert_test.go +++ b/cmd/gitaly-git2go/revert_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" cmdtesthelper "gitlab.com/gitlab-org/gitaly/cmd/gitaly-git2go/testhelper" diff --git a/cmd/gitaly-git2go/submodule.go b/cmd/gitaly-git2go/submodule.go index 6d0c8e9ac..7c68cc9f8 100644 --- a/cmd/gitaly-git2go/submodule.go +++ b/cmd/gitaly-git2go/submodule.go @@ -9,7 +9,7 @@ import ( "io" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "gitlab.com/gitlab-org/gitaly/internal/git2go" ) diff --git a/cmd/gitaly-git2go/testhelper/testhelper.go b/cmd/gitaly-git2go/testhelper/testhelper.go index 44741c195..c8aa9ca36 100644 --- a/cmd/gitaly-git2go/testhelper/testhelper.go +++ b/cmd/gitaly-git2go/testhelper/testhelper.go @@ -6,7 +6,7 @@ import ( "testing" "time" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" "github.com/stretchr/testify/require" ) diff --git a/cmd/gitaly-git2go/util.go b/cmd/gitaly-git2go/util.go index a315c5f3a..31dfa281c 100644 --- a/cmd/gitaly-git2go/util.go +++ b/cmd/gitaly-git2go/util.go @@ -5,7 +5,7 @@ package main import ( "fmt" - git "github.com/libgit2/git2go/v30" + git "github.com/libgit2/git2go/v31" ) func lookupCommit(repo *git.Repository, ref string) (*git.Commit, error) { @@ -23,7 +23,7 @@ require ( github.com/hashicorp/golang-lru v0.5.4 github.com/kelseyhightower/envconfig v1.3.0 github.com/lib/pq v1.2.0 - github.com/libgit2/git2go/v30 v30.0.18 + github.com/libgit2/git2go/v31 v31.4.12 github.com/mattn/go-isatty v0.0.12 // indirect github.com/olekukonko/tablewriter v0.0.2 github.com/opencontainers/runtime-spec v1.0.2 @@ -38,11 +38,10 @@ require ( github.com/uber/jaeger-client-go v2.15.0+incompatible gitlab.com/gitlab-org/gitlab-shell v1.9.8-0.20201117050822-3f9890ef73dc gitlab.com/gitlab-org/labkit v1.0.0 - golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5 // indirect golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 - golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 + golang.org/x/sys v0.0.0-20201204225414-ed752295db88 golang.org/x/text v0.3.3 // indirect google.golang.org/grpc v1.29.1 gopkg.in/yaml.v2 v2.3.0 // indirect @@ -181,6 +181,8 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc h1:DLpL8pWq0v4JYoRpEhDfsJhhJyGKCcQM2WPW2TJs31c= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= @@ -263,8 +265,8 @@ github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/libgit2/git2go v0.0.0-20190104134018-ecaeb7a21d47 h1:HDt7WT3kpXSHq4mlOuLzgXH9LeOK1qlhyFdKIAzxxeM= github.com/libgit2/git2go v0.0.0-20190104134018-ecaeb7a21d47/go.mod h1:4bKN42efkbNYMZlvDfxGDxzl066GhpvIircZDsm8Y+Y= -github.com/libgit2/git2go/v30 v30.0.18 h1:lsTvvjpLelHZQ3XXsmyFJKMd9HazBIJdValbdIjlBdA= -github.com/libgit2/git2go/v30 v30.0.18/go.mod h1:bEqWPWaJjDpnkerA2FlyUdsuhc5/3UPBjYJ6SV0X3gY= +github.com/libgit2/git2go/v31 v31.4.12 h1:+/8GzvoEKXzpeFeidTwcKcZNFGm7VaowgNzRduRehMc= +github.com/libgit2/git2go/v31 v31.4.12/go.mod h1:c/rkJcBcUFx6wHaT++UwNpKvIsmPNqCeQ/vzO4DrEec= github.com/lightstep/lightstep-tracer-go v0.15.6 h1:D0GGa7afJ7GcQvu5as6ssLEEKYXvRgKI5d5cevtz8r4= github.com/lightstep/lightstep-tracer-go v0.15.6/go.mod h1:6AMpwZpsyCFwSovxzM78e+AsYxE8sGwiM6C3TytaWeI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -490,9 +492,8 @@ golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= -golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c h1:9HhBz5L/UjnK9XLtiZhYAdue5BVKep3PMmS2LuPDt8k= +golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -589,8 +590,10 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f h1:6Sc1XOXTulBN6imkqo6XoAXDEzoQ4/ro6xy7Vn8+rOM= golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88 h1:KmZPnMocC93w341XZp26yTJg8Za7lhb2KhkYmixoeso= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= diff --git a/ruby/Gemfile b/ruby/Gemfile index d2b3d2ea0..00215cc55 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rugged', '~> 1.0.1' +gem 'rugged', '~> 1.1' gem 'github-linguist', '~> 7.12', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.4' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 83c5f20f7..32d761f9f 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -183,7 +183,7 @@ GEM rubocop-ast (0.2.0) parser (>= 2.7.0.1) ruby-progressbar (1.10.1) - rugged (1.0.1) + rugged (1.1.0) sanitize (4.6.6) crass (~> 1.0.2) nokogiri (>= 1.4.4) @@ -233,7 +233,7 @@ DEPENDENCIES rspec rspec-parameterized rubocop (~> 0.69) - rugged (~> 1.0.1) + rugged (~> 1.1) sentry-raven (~> 3.0) timecop |