Skip to content

Commit 684bb0e

Browse files
Merge pull request #358 from mergestat/chore/upgrade-libgit2
chore: upgrade `libgit2` and `git2go` versions
2 parents 97fed80 + 563acad commit 684bb0e

File tree

7 files changed

+7
-13
lines changed

7 files changed

+7
-13
lines changed

extensions/internal/git/native/blame.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/augmentable-dev/vtab"
1010
"github.com/go-git/go-git/v5/storage/filesystem"
11-
libgit2 "github.com/libgit2/git2go/v33"
11+
libgit2 "github.com/libgit2/git2go/v34"
1212
"github.com/mergestat/mergestat-lite/extensions/internal/git/utils"
1313
"github.com/pkg/errors"
1414
"go.riyazali.net/sqlite"

extensions/internal/git/native/files.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/augmentable-dev/vtab"
1111
"github.com/go-git/go-git/v5/storage/filesystem"
12-
libgit2 "github.com/libgit2/git2go/v33"
12+
libgit2 "github.com/libgit2/git2go/v34"
1313
"github.com/mergestat/mergestat-lite/extensions/internal/git/utils"
1414
"go.riyazali.net/sqlite"
1515
)

extensions/internal/git/native/stats.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/augmentable-dev/vtab"
99
"github.com/go-git/go-git/v5/storage/filesystem"
10-
libgit2 "github.com/libgit2/git2go/v33"
10+
libgit2 "github.com/libgit2/git2go/v34"
1111
"github.com/mergestat/mergestat-lite/extensions/internal/git/utils"
1212
"go.riyazali.net/sqlite"
1313
)

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/jedib0t/go-pretty v4.3.0+incompatible
1818
github.com/jmoiron/sqlx v1.3.5
1919
github.com/lib/pq v1.10.7
20-
github.com/libgit2/git2go/v33 v33.0.9
20+
github.com/libgit2/git2go/v34 v34.0.0
2121
github.com/mattn/go-sqlite3 v1.14.16
2222
github.com/mergestat/timediff v0.0.3
2323
github.com/pkg/errors v0.9.1
@@ -82,4 +82,4 @@ require (
8282
gopkg.in/yaml.v2 v2.4.0 // indirect
8383
)
8484

85-
replace github.com/libgit2/git2go/v33 => ./git2go
85+
replace github.com/libgit2/git2go/v34 => ./git2go

go.sum

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,13 @@ golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBc
305305
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
306306
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
307307
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
308-
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
309-
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
310308
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
311309
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
312310
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
313311
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
314312
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
315313
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
316314
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
317-
golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI=
318-
golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
319315
golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
320316
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
321317
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=
324320
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
325321
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
326322
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
327-
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
328-
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
329323
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
330324
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
331325
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=

scripts/install_libgit2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
git clone https://github.com/libgit2/libgit2.git ~/libgit2
44
cd ~/libgit2
5-
git checkout v1.3.0
5+
git checkout v1.5.0
66
mkdir build && cd build
77
cmake .. -DBUILD_CLAR=0 -DBUILD_SHARED_LIBS=0 -DCMAKE_C_FLAGS="-fPIC"
88
cmake --build . --target install

0 commit comments

Comments
 (0)