Skip to content

Commit

Permalink
Merge pull request #358 from mergestat/chore/upgrade-libgit2
Browse files Browse the repository at this point in the history 
chore: upgrade `libgit2` and `git2go` versions
  • Loading branch information
@patrickdevivo
patrickdevivo authored Jan 9, 2023
2 parents 97fed80 + 563acad commit 684bb0e
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion extensions/internal/git/native/blame.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion extensions/internal/git/native/files.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion extensions/internal/git/native/stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion git2go
Submodule git2go updated 11 files
+1 −1 .github/workflows/backport.yml
+1 −1 .github/workflows/ci.yml
+2 −2 Build_bundled_static.go
+2 −2 Build_system_dynamic.go
+2 −2 Build_system_static.go
+8 −7 README.md
+1 −1 go.mod
+6 −4 http.go
+13 −2 remote.go
+5 −5 transport.go
+1 −1 vendor/libgit2
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
6 changes: 0 additions & 6 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,17 +305,13 @@ 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=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
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=
Expand All @@ -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=
Expand Down
2 changes: 1 addition & 1 deletion scripts/install_libgit2.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 684bb0e

Please sign in to comment.