diff options
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | git_dynamic.go | 4 | ||||
| -rw-r--r-- | git_static.go | 4 | ||||
| -rw-r--r-- | submodule.go | 2 | ||||
| m--------- | vendor/libgit2 | 0 |
5 files changed, 11 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 6131e6d..dd9f97a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: go go: - 1.7 - 1.8 + - 1.9 - tip script: make test-static @@ -11,6 +12,12 @@ matrix: allow_failures: - go: tip +git: + submodules: false + +before_install: + - git submodule update --init + branches: only: - master diff --git a/git_dynamic.go b/git_dynamic.go index f89d509..00828a5 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 != 25 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.25" +#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 26 +# error "Invalid libgit2 version; this git2go supports libgit2 v0.26" #endif */ diff --git a/git_static.go b/git_static.go index d0acb3a..b42d49f 100644 --- a/git_static.go +++ b/git_static.go @@ -9,8 +9,8 @@ package git #cgo !windows pkg-config: --static ${SRCDIR}/vendor/libgit2/build/libgit2.pc #include <git2.h> -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 25 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.25" +#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 26 +# error "Invalid libgit2 version; this git2go supports libgit2 v0.26" #endif */ diff --git a/submodule.go b/submodule.go index 406ed08..f4b4f15 100644 --- a/submodule.go +++ b/submodule.go @@ -15,7 +15,6 @@ import ( type SubmoduleUpdateOptions struct { *CheckoutOpts *FetchOptions - CloneCheckoutStrategy CheckoutStrategy } // Submodule @@ -369,7 +368,6 @@ func populateSubmoduleUpdateOptions(ptr *C.git_submodule_update_options, opts *S populateCheckoutOpts(&ptr.checkout_opts, opts.CheckoutOpts) populateFetchOptions(&ptr.fetch_opts, opts.FetchOptions) - ptr.clone_checkout_strategy = C.uint(opts.CloneCheckoutStrategy) return nil } diff --git a/vendor/libgit2 b/vendor/libgit2 -Subproject df4dfaadcf709646ebab2e57e3589952cf1ac80 +Subproject 15e119375018fba121cf58e02a9f17fe22df0df |