diff --git a/.travis.yml b/.travis.yml index ffbba64..6131e6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,6 @@ matrix: allow_failures: - go: tip -git: - submodules: false - -before_install: - - git submodule update --init - branches: only: - master diff --git a/git_static.go b/git_static.go index b42d49f..d0acb3a 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 -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 26 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.26" +#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 25 +# error "Invalid libgit2 version; this git2go supports libgit2 v0.25" #endif */ diff --git a/submodule.go b/submodule.go index f4b4f15..41734ac 100644 --- a/submodule.go +++ b/submodule.go @@ -15,6 +15,7 @@ import ( type SubmoduleUpdateOptions struct { *CheckoutOpts *FetchOptions + CloneCheckoutStrategy CheckoutStrategy } // Submodule diff --git a/vendor/libgit2 b/vendor/libgit2 index 32dc763..15e1193 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 32dc763c116999240440b5054798208d97b4c562 +Subproject commit 15e119375018fba121cf58e02a9f17fe22df0df8