diff options
| -rw-r--r-- | README.md | 13 | ||||
| -rw-r--r-- | git_dynamic.go | 4 | ||||
| -rw-r--r-- | git_static.go | 4 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | signature.go | 4 | ||||
| m--------- | vendor/libgit2 | 0 |
6 files changed, 16 insertions, 11 deletions
@@ -10,18 +10,19 @@ Due to the fact that Go 1.11 module versions have semantic meaning and don't nec | libgit2 | git2go | |---------|---------------| -| master | (will be v30) | +| master | (will be 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 v0.99 installed, you'd import git2go v29 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 v30 with ```sh -go get github.com/libgit2/git2go/v29 +go get github.com/libgit2/git2go/v30 ``` ```go -import "github.com/libgit2/git2go/v29" +import "github.com/libgit2/git2go/v30" ``` which will ensure there are no sudden changes to the API. @@ -42,10 +43,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 v0.99 +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 ```go -import "github.com/libgit2/git2go/v29" +import "github.com/libgit2/git2go/v30" ``` ### Master branch, or static linking diff --git a/git_dynamic.go b/git_dynamic.go index 9112954..b31083e 100644 --- a/git_dynamic.go +++ b/git_dynamic.go @@ -6,8 +6,8 @@ package git #include <git2.h> #cgo pkg-config: libgit2 -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 99 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.99" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.0" #endif */ diff --git a/git_static.go b/git_static.go index 4dcb1db..46865fb 100644 --- a/git_static.go +++ b/git_static.go @@ -8,8 +8,8 @@ package git #cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc #include <git2.h> -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 99 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.99" +#if LIBGIT2_VER_MAJOR != 1 || LIBGIT2_VER_MINOR != 0 +# error "Invalid libgit2 version; this git2go supports libgit2 v1.0" #endif */ @@ -1,3 +1,3 @@ -module github.com/libgit2/git2go/v29 +module github.com/libgit2/git2go/v30 go 1.13 diff --git a/signature.go b/signature.go index 220fe57..dfd9718 100644 --- a/signature.go +++ b/signature.go @@ -17,6 +17,10 @@ type Signature struct { } func newSignatureFromC(sig *C.git_signature) *Signature { + if sig == nil { + return nil + } + // git stores minutes, go wants seconds loc := time.FixedZone("", int(sig.when.offset)*60) return &Signature{ diff --git a/vendor/libgit2 b/vendor/libgit2 -Subproject 172239021f7ba04fe7327647b213799853a9eb8 +Subproject 7d3c7057f0e774aecd6fc4ef8333e69e5c4873e |