From e424134bb6a425a508cf037ed62218c6b21600ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Baranowski?= Date: Sat, 22 Jul 2017 20:10:08 +0200 Subject: [PATCH 01/11] clone_checkout_strategy removed https://github.com/libgit2/libgit2/releases/tag/v0.26.0 --- submodule.go | 2 -- 1 file changed, 2 deletions(-) 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 } -- 2.45.2 From 37906a68d5504fa422de48c267f582859ef5c8c5 Mon Sep 17 00:00:00 2001 From: Dariusz Pelowski Date: Mon, 14 Aug 2017 12:12:04 +0200 Subject: [PATCH 02/11] align to libgit2 v0.26.0 api changes: `clone_checkout_strategy` has been removed from libgit2. The checkout strategy used to clone will be the same strategy specified in `checkout_opts` --- submodule.go | 1 - vendor/libgit2 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/submodule.go b/submodule.go index 406ed08..41734ac 100644 --- a/submodule.go +++ b/submodule.go @@ -369,7 +369,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 index df4dfaa..15e1193 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit df4dfaadcf709646ebab2e57e3589952cf1ac809 +Subproject commit 15e119375018fba121cf58e02a9f17fe22df0df8 -- 2.45.2 From f93b2433d58bc5462ca0b60889b82ab119464d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sun, 3 Sep 2017 16:09:44 +0200 Subject: [PATCH 03/11] Update the static version check to v0.26 --- git_static.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -#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 */ -- 2.45.2 From 1dedb84bded8b3ef199908f02c2447396f523130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sun, 3 Sep 2017 16:10:10 +0200 Subject: [PATCH 04/11] Update vendored libgit2 to a released v0.26 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index df4dfaa..15e1193 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit df4dfaadcf709646ebab2e57e3589952cf1ac809 +Subproject commit 15e119375018fba121cf58e02a9f17fe22df0df8 -- 2.45.2 From eb0bf21280bf589ebc69341b3040616463542f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sun, 3 Sep 2017 16:20:19 +0200 Subject: [PATCH 05/11] travis: don't update submodules recursively We have invalid submodules for testing and Travis gets unhappy. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6131e6d..ffbba64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,12 @@ matrix: allow_failures: - go: tip +git: + submodules: false + +before_install: + - git submodule update --init + branches: only: - master -- 2.45.2 From 9ec9f647d468fb8aad080bf4151742077b3bda31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 12 Mar 2018 23:30:27 +0100 Subject: [PATCH 06/11] vendor: update to v0.26.2 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 15e1193..dd2d538 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 15e119375018fba121cf58e02a9f17fe22df0df8 +Subproject commit dd2d5381773ca3f7bc31f56aea6fc067db5ea404 -- 2.45.2 From ca5ecbe9b7ed75ba85e50b7fbba900e98e8151ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Mon, 12 Mar 2018 23:56:13 +0100 Subject: [PATCH 07/11] vendor: update to libgit2 v0.26.3 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index dd2d538..15e1193 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit dd2d5381773ca3f7bc31f56aea6fc067db5ea404 +Subproject commit 15e119375018fba121cf58e02a9f17fe22df0df8 -- 2.45.2 From 1f712c6f9608f55e9756073539dec0c9a9a81bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Tue, 13 Mar 2018 09:00:06 +0100 Subject: [PATCH 08/11] vendor: really update to libgit2 v0.26.3 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 15e1193..b55bb43 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 15e119375018fba121cf58e02a9f17fe22df0df8 +Subproject commit b55bb43d0a733e6100d4eb52719b619281550a00 -- 2.45.2 From d4a1519215fc5b3db03cb4585a40f189eb48d0b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Wed, 8 Aug 2018 11:37:18 +0200 Subject: [PATCH 09/11] Bump vendored libgit2 to v0.26.6 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index b55bb43..e98d0a3 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit b55bb43d0a733e6100d4eb52719b619281550a00 +Subproject commit e98d0a37c93574d2c6107bf7f31140b548c6a7bf -- 2.45.2 From 2d22de8d7e522558cf104c3048773874de25cee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Sun, 7 Oct 2018 18:47:11 +0200 Subject: [PATCH 10/11] Update vendored libgit2 to v0.26.7 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index e98d0a3..2bd9b6b 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit e98d0a37c93574d2c6107bf7f31140b548c6a7bf +Subproject commit 2bd9b6b67706c8cb84d367f699cc9c48c2719dff -- 2.45.2 From 0231fb5a68072689669db0195377d977b2773d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Fri, 4 Jan 2019 13:41:19 +0000 Subject: [PATCH 11/11] Update vendored libgit2 to v0.26.8 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 2bd9b6b..32dc763 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 2bd9b6b67706c8cb84d367f699cc9c48c2719dff +Subproject commit 32dc763c116999240440b5054798208d97b4c562 -- 2.45.2