diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index c0b0d9e2..b3fbb4ee 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - branch: [ 'release-1.2', 'release-1.1', 'release-1.0', 'release-0.28', 'release-0.27' ] + branch: [ 'release-1.3', 'release-1.2', 'release-1.1', 'release-1.0', 'release-0.28', 'release-0.27' ] runs-on: ubuntu-20.04 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd0cde24..4c884feb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,7 +62,7 @@ jobs: fail-fast: false matrix: libgit2: - - 'v1.3.1' + - 'v1.5.0' name: Go (system-wide, dynamic) runs-on: ubuntu-20.04 diff --git a/Build_bundled_static.go b/Build_bundled_static.go index d9b3713c..9af2d954 100644 --- a/Build_bundled_static.go +++ b/Build_bundled_static.go @@ -10,8 +10,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 3 || LIBGIT2_VER_MINOR > 3 -# error "Invalid libgit2 version; this git2go supports libgit2 between v1.3.0 and v1.3.0" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 5 || LIBGIT2_VER_MINOR > 5 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.5.0 and v1.5.0" #endif */ import "C" diff --git a/Build_system_dynamic.go b/Build_system_dynamic.go index a8e69425..bc423b59 100644 --- a/Build_system_dynamic.go +++ b/Build_system_dynamic.go @@ -8,8 +8,8 @@ package git #cgo CFLAGS: -DLIBGIT2_DYNAMIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 3 || LIBGIT2_VER_MINOR > 3 -# error "Invalid libgit2 version; this git2go supports libgit2 between v1.3.0 and v1.3.0" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 5 || LIBGIT2_VER_MINOR > 5 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.5.0 and v1.5.0" #endif */ import "C" diff --git a/Build_system_static.go b/Build_system_static.go index a96894fa..7038e93d 100644 --- a/Build_system_static.go +++ b/Build_system_static.go @@ -8,8 +8,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 3 || LIBGIT2_VER_MINOR > 3 -# error "Invalid libgit2 version; this git2go supports libgit2 between v1.3.0 and v1.3.0" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR < 5 || LIBGIT2_VER_MINOR > 5 +# error "Invalid libgit2 version; this git2go supports libgit2 between v1.5.0 and v1.5.0" #endif */ import "C" diff --git a/README.md b/README.md index 94fdab64..28165902 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ git2go ====== -[![GoDoc](https://godoc.org/github.com/libgit2/git2go?status.svg)](http://godoc.org/github.com/libgit2/git2go/v33) [![Build Status](https://travis-ci.org/libgit2/git2go.svg?branch=main)](https://travis-ci.org/libgit2/git2go) +[![GoDoc](https://godoc.org/github.com/libgit2/git2go?status.svg)](http://godoc.org/github.com/libgit2/git2go/v34) [![Build Status](https://travis-ci.org/libgit2/git2go.svg?branch=main)](https://travis-ci.org/libgit2/git2go) Go bindings for [libgit2](http://libgit2.github.com/). @@ -10,7 +10,8 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec | libgit2 | git2go | |---------|---------------| -| main | (will be v34) | +| main | (will be v35) | +| 1.5 | v34 | | 1.3 | v33 | | 1.2 | v32 | | 1.1 | v31 | @@ -19,13 +20,13 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec | 0.28 | v28 | | 0.27 | v27 | -You can import them in your project with the version's major number as a suffix. For example, if you have libgit2 v1.2 installed, you'd import git2go v33 with: +You can import them in your project with the version's major number as a suffix. For example, if you have libgit2 v1.2 installed, you'd import git2go v34 with: ```sh -go get github.com/libgit2/git2go/v33 +go get github.com/libgit2/git2go/v34 ``` ```go -import "github.com/libgit2/git2go/v33" +import "github.com/libgit2/git2go/v34" ``` which will ensure there are no sudden changes to the API. @@ -49,7 +50,7 @@ This project wraps the functionality provided by libgit2. If you're using a vers When linking dynamically against a released version of libgit2, install it via your system's package manager. CGo will take care of finding its pkg-config file and set up the linking. Import via Go modules, e.g. to work against libgit2 v1.2 ```go -import "github.com/libgit2/git2go/v33" +import "github.com/libgit2/git2go/v34" ``` ### Versioned branch, static linking @@ -79,7 +80,7 @@ In order to let Go pass the correct flags to `pkg-config`, `-tags static` needs One thing to take into account is that since Go expects the `pkg-config` file to be within the same directory where `make install-static` was called, so the `go.mod` file may need to have a [`replace` directive](https://github.com/golang/go/wiki/Modules#when-should-i-use-the-replace-directive) so that the correct setup is achieved. So if `git2go` is checked out at `$GOPATH/src/github.com/libgit2/git2go` and your project at `$GOPATH/src/github.com/my/project`, the `go.mod` file of `github.com/my/project` might need to have a line like - replace github.com/libgit2/git2go/v33 => ../../libgit2/git2go + replace github.com/libgit2/git2go/v34 => ../../libgit2/git2go Parallelism and network operations ---------------------------------- diff --git a/go.mod b/go.mod index c8028ef3..ed6d20cc 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/libgit2/git2go/v33 +module github.com/libgit2/git2go/v34 go 1.13 diff --git a/http.go b/http.go index cb4c7d0e..ce6b8fcf 100644 --- a/http.go +++ b/http.go @@ -38,17 +38,17 @@ func registerManagedHTTP() error { func httpSmartSubtransportFactory(remote *Remote, transport *Transport) (SmartSubtransport, error) { var proxyFn func(*http.Request) (*url.URL, error) - proxyOpts, err := transport.SmartProxyOptions() + remoteConnectOpts, err := transport.SmartRemoteConnectOptions() if err != nil { return nil, err } - switch proxyOpts.Type { + switch remoteConnectOpts.ProxyOptions.Type { case ProxyTypeNone: proxyFn = nil case ProxyTypeAuto: proxyFn = http.ProxyFromEnvironment case ProxyTypeSpecified: - parsedUrl, err := url.Parse(proxyOpts.Url) + parsedUrl, err := url.Parse(remoteConnectOpts.ProxyOptions.Url) if err != nil { return nil, err } diff --git a/remote.go b/remote.go index cde92b94..a294ca23 100644 --- a/remote.go +++ b/remote.go @@ -146,6 +146,17 @@ type FetchOptions struct { ProxyOptions ProxyOptions } +type RemoteConnectOptions struct { + // Proxy options to use for this fetch operation + ProxyOptions ProxyOptions +} + +func remoteConnectOptionsFromC(copts *C.git_remote_connect_options) *RemoteConnectOptions { + return &RemoteConnectOptions{ + ProxyOptions: proxyOptionsFromC(&copts.proxy_opts), + } +} + type ProxyType uint const ( @@ -170,8 +181,8 @@ type ProxyOptions struct { Url string } -func proxyOptionsFromC(copts *C.git_proxy_options) *ProxyOptions { - return &ProxyOptions{ +func proxyOptionsFromC(copts *C.git_proxy_options) ProxyOptions { + return ProxyOptions{ Type: ProxyType(copts._type), Url: C.GoString(copts.url), } diff --git a/transport.go b/transport.go index 23514b47..bb9f2b30 100644 --- a/transport.go +++ b/transport.go @@ -84,17 +84,17 @@ type Transport struct { ptr *C.git_transport } -// SmartProxyOptions gets a copy of the proxy options for this transport. -func (t *Transport) SmartProxyOptions() (*ProxyOptions, error) { +// SmartRemoteConnectOptions gets a copy of the proxy options for this transport. +func (t *Transport) SmartRemoteConnectOptions() (*RemoteConnectOptions, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() - var cpopts C.git_proxy_options - if ret := C.git_transport_smart_proxy_options(&cpopts, t.ptr); ret < 0 { + var copts C.git_remote_connect_options + if ret := C.git_transport_remote_connect_options(&copts, t.ptr); ret < 0 { return nil, MakeGitError(ret) } - return proxyOptionsFromC(&cpopts), nil + return remoteConnectOptionsFromC(&copts), nil } // SmartCredentials calls the credentials callback for this transport. diff --git a/vendor/libgit2 b/vendor/libgit2 index 1f5e7f9a..fbea439d 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 1f5e7f9add5c8bbc602b14feaec216c8877c3c84 +Subproject commit fbea439d4b6fc91c6b619d01b85ab3b7746e4c19