From f54790e733554f84c3c8283b4708835b4c8aa84b Mon Sep 17 00:00:00 2001 From: Karsten Dambekalns Date: Thu, 6 Oct 2022 19:37:16 +0200 Subject: [PATCH] Use "original" libgit2/git2go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Works with libgit2 1.5.0 installed using ´brew install libgit2` --- go.mod | 4 +--- go.sum | 2 ++ splitter/cache.go | 2 +- splitter/config.go | 2 +- splitter/result.go | 2 +- splitter/state.go | 2 +- splitter/utils.go | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 6bc4a7c..3f8494c 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,10 @@ go 1.17 require ( github.com/boltdb/bolt v1.3.1 - github.com/libgit2/git2go v0.0.0-00010101000000-000000000000 + github.com/libgit2/git2go/v34 v34.0.0 ) require ( golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c // indirect golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect ) - -replace github.com/libgit2/git2go => ../../libgit2/git2go diff --git a/go.sum b/go.sum index 7adedc5..5f858f3 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= 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/libgit2/git2go/v34 v34.0.0 h1:UKoUaKLmiCRbOCD3PtUi2hD6hESSXzME/9OUZrGcgu8= +github.com/libgit2/git2go/v34 v34.0.0/go.mod h1:blVco2jDAw6YTXkErMMqzHLcAjKkwF0aWIRHBqiJkZ0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= 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= diff --git a/splitter/cache.go b/splitter/cache.go index 740b4bf..10ef216 100644 --- a/splitter/cache.go +++ b/splitter/cache.go @@ -9,7 +9,7 @@ import ( "time" "github.com/boltdb/bolt" - git "github.com/libgit2/git2go" + git "github.com/libgit2/git2go/v34" ) type cache struct { diff --git a/splitter/config.go b/splitter/config.go index ca1d595..bd0c734 100644 --- a/splitter/config.go +++ b/splitter/config.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/boltdb/bolt" - git "github.com/libgit2/git2go" + git "github.com/libgit2/git2go/v34" ) // Prefix represents which paths to split diff --git a/splitter/result.go b/splitter/result.go index c3f7aa7..ed99ecf 100644 --- a/splitter/result.go +++ b/splitter/result.go @@ -4,7 +4,7 @@ import ( "sync" "time" - git "github.com/libgit2/git2go" + git "github.com/libgit2/git2go/v34" ) // Result represents the outcome of a split diff --git a/splitter/state.go b/splitter/state.go index f7d04a9..20a3af2 100644 --- a/splitter/state.go +++ b/splitter/state.go @@ -8,7 +8,7 @@ import ( "sync" "time" - git "github.com/libgit2/git2go" + git "github.com/libgit2/git2go/v34" ) type state struct { diff --git a/splitter/utils.go b/splitter/utils.go index f500999..3c9249f 100644 --- a/splitter/utils.go +++ b/splitter/utils.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - git "github.com/libgit2/git2go" + git "github.com/libgit2/git2go/v34" ) var messageNormalizer = regexp.MustCompile(`\s*\r?\n`)