From fc6f0827f9f1ea5ef554e4cd05283e1e65aee1b6 Mon Sep 17 00:00:00 2001 From: Suhaib Mujahid Date: Mon, 26 Oct 2020 09:29:02 -0400 Subject: [PATCH] Create v31 to support libgit2 v1.1.x --- README.md | 15 ++++++++------- git_bundled_static.go | 4 ++-- git_system_dynamic.go | 4 ++-- git_system_static.go | 4 ++-- go.mod | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 79a96e9..1e47e35 100644 --- a/README.md +++ b/README.md @@ -10,19 +10,20 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec | libgit2 | git2go | |---------|---------------| -| master | (will be v31) | +| master | (will be v32) | +| 1.1 | v31 | | 1.0 | v30 | | 0.99 | v29 | | 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.0 installed, you'd import git2go v30 with +You can import them in your project with the version's major number as a suffix. For example, if you have libgit2 v1.0 installed, you'd import git2go v31 with: ```sh -go get github.com/libgit2/git2go/v30 +go get github.com/libgit2/git2go/v31 ``` ```go -import "github.com/libgit2/git2go/v30" +import "github.com/libgit2/git2go/v31" ``` which will ensure there are no sudden changes to the API. @@ -43,10 +44,10 @@ This project wraps the functionality provided by libgit2. If you're using a vers ### Versioned branch, dynamic linking -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.0 +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.1 ```go -import "github.com/libgit2/git2go/v30" +import "github.com/libgit2/git2go/v31" ``` ### Versioned branch, static linking @@ -76,7 +77,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/v30 ../../libgit2/git2go + replace github.com/libgit2/git2go/v31 ../../libgit2/git2go Parallelism and network operations ---------------------------------- diff --git a/git_bundled_static.go b/git_bundled_static.go index a5a590b..48d9be5 100644 --- a/git_bundled_static.go +++ b/git_bundled_static.go @@ -9,8 +9,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.0" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.1" #endif */ import "C" diff --git a/git_system_dynamic.go b/git_system_dynamic.go index daed8ff..571a77f 100644 --- a/git_system_dynamic.go +++ b/git_system_dynamic.go @@ -7,8 +7,8 @@ package git #cgo CFLAGS: -DLIBGIT2_DYNAMIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.0" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.1" #endif */ import "C" diff --git a/git_system_static.go b/git_system_static.go index d30676a..3049763 100644 --- a/git_system_static.go +++ b/git_system_static.go @@ -7,8 +7,8 @@ package git #cgo CFLAGS: -DLIBGIT2_STATIC #include -#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0 -# error "Invalid libgit2 version; this git2go supports libgit2 v1.0" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 1 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.1" #endif */ import "C" diff --git a/go.mod b/go.mod index c190305..42cdb9d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/libgit2/git2go/v30 +module github.com/libgit2/git2go/v31 go 1.13