diff --git a/extensions/internal/git/native/blame.go b/extensions/internal/git/native/blame.go index cb3e3ec0..2074f8df 100644 --- a/extensions/internal/git/native/blame.go +++ b/extensions/internal/git/native/blame.go @@ -8,7 +8,7 @@ import ( "github.com/augmentable-dev/vtab" "github.com/go-git/go-git/v5/storage/filesystem" - libgit2 "github.com/libgit2/git2go/v33" + libgit2 "github.com/libgit2/git2go/v34" "github.com/mergestat/mergestat-lite/extensions/internal/git/utils" "github.com/pkg/errors" "go.riyazali.net/sqlite" diff --git a/extensions/internal/git/native/files.go b/extensions/internal/git/native/files.go index 93ee36ed..9aed5217 100644 --- a/extensions/internal/git/native/files.go +++ b/extensions/internal/git/native/files.go @@ -9,7 +9,7 @@ import ( "github.com/augmentable-dev/vtab" "github.com/go-git/go-git/v5/storage/filesystem" - libgit2 "github.com/libgit2/git2go/v33" + libgit2 "github.com/libgit2/git2go/v34" "github.com/mergestat/mergestat-lite/extensions/internal/git/utils" "go.riyazali.net/sqlite" ) diff --git a/extensions/internal/git/native/stats.go b/extensions/internal/git/native/stats.go index 3132af39..d2d603e8 100644 --- a/extensions/internal/git/native/stats.go +++ b/extensions/internal/git/native/stats.go @@ -7,7 +7,7 @@ import ( "github.com/augmentable-dev/vtab" "github.com/go-git/go-git/v5/storage/filesystem" - libgit2 "github.com/libgit2/git2go/v33" + libgit2 "github.com/libgit2/git2go/v34" "github.com/mergestat/mergestat-lite/extensions/internal/git/utils" "go.riyazali.net/sqlite" ) diff --git a/git2go b/git2go index 7bff4ca7..c1ec21d8 160000 --- a/git2go +++ b/git2go @@ -1 +1 @@ -Subproject commit 7bff4ca7addde8cc54c38f5db1e50fa420189a20 +Subproject commit c1ec21d89caa0cdb0aefd6f6b8f95648418a3543 diff --git a/go.mod b/go.mod index c2bad3ae..65e54c5a 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/jedib0t/go-pretty v4.3.0+incompatible github.com/jmoiron/sqlx v1.3.5 github.com/lib/pq v1.10.7 - github.com/libgit2/git2go/v33 v33.0.9 + github.com/libgit2/git2go/v34 v34.0.0 github.com/mattn/go-sqlite3 v1.14.16 github.com/mergestat/timediff v0.0.3 github.com/pkg/errors v0.9.1 @@ -82,4 +82,4 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect ) -replace github.com/libgit2/git2go/v33 => ./git2go +replace github.com/libgit2/git2go/v34 => ./git2go diff --git a/go.sum b/go.sum index 74f41ea2..fda001a2 100644 --- a/go.sum +++ b/go.sum @@ -305,8 +305,6 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -314,8 +312,6 @@ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9sn golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -324,8 +320,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= diff --git a/scripts/install_libgit2.sh b/scripts/install_libgit2.sh index 04c8544e..793bc04a 100755 --- a/scripts/install_libgit2.sh +++ b/scripts/install_libgit2.sh @@ -2,7 +2,7 @@ git clone https://github.com/libgit2/libgit2.git ~/libgit2 cd ~/libgit2 -git checkout v1.3.0 +git checkout v1.5.0 mkdir build && cd build cmake .. -DBUILD_CLAR=0 -DBUILD_SHARED_LIBS=0 -DCMAKE_C_FLAGS="-fPIC" cmake --build . --target install