From 9163ca7d5072114975bed794226dd90d37d856b4 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Thu, 21 Apr 2016 16:34:51 +0200 Subject: Update to 1dc4491 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/libgit2 b/vendor/libgit2 index 785d8c4..1dc4491 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 785d8c48ea8725691da3c50e7dae8751523d4c30 +Subproject commit 1dc449105b329ea4f8ea9982bc2da869d231c04a -- cgit v1.2.3 From 37d3c2d9ad4c4e970cac02faec8ad184412c34e6 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Fri, 5 Aug 2016 15:15:22 +0200 Subject: Update libgit2 to 73dab769 This version reloads the index on checkout, which showed we were not persisting the updated index to disk and thus would have conflicts on checkout. --- git_test.go | 4 ++++ vendor/libgit2 | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'vendor') diff --git a/git_test.go b/git_test.go index 58caf71..6a58844 100644 --- a/git_test.go +++ b/git_test.go @@ -58,6 +58,8 @@ func seedTestRepo(t *testing.T, repo *Repository) (*Oid, *Oid) { checkFatal(t, err) err = idx.AddByPath("README") checkFatal(t, err) + err = idx.Write() + checkFatal(t, err) treeId, err := idx.WriteTree() checkFatal(t, err) @@ -91,6 +93,8 @@ func updateReadme(t *testing.T, repo *Repository, content string) (*Oid, *Oid) { checkFatal(t, err) err = idx.AddByPath("README") checkFatal(t, err) + err = idx.Write() + checkFatal(t, err) treeId, err := idx.WriteTree() checkFatal(t, err) diff --git a/vendor/libgit2 b/vendor/libgit2 index 1dc4491..73dab76 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 1dc449105b329ea4f8ea9982bc2da869d231c04a +Subproject commit 73dab7692e780e1df96093a54854795428eb66b4 -- cgit v1.2.3 From e8062bcaddc2533f28b9af6323f507a96bc1b092 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Mon, 31 Oct 2016 19:31:43 +0100 Subject: Update to libgit2 a051ee3 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/libgit2 b/vendor/libgit2 index 73dab76..a051ee3 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 73dab7692e780e1df96093a54854795428eb66b4 +Subproject commit a051ee31f2a3790410c2b482611f691135d2eae0 -- cgit v1.2.3 From a41e2b66449f05093de71f8debc71092f0a8117e Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Sat, 19 Nov 2016 15:09:41 +0100 Subject: Update to 0.25-rc1 --- git.go | 4 ++-- vendor/libgit2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vendor') diff --git a/git.go b/git.go index 77394cf..cb973ee 100644 --- a/git.go +++ b/git.go @@ -8,8 +8,8 @@ package git #include #include -#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 24 -# error "Invalid libgit2 version; this git2go supports libgit2 v0.24" +#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 25 +# error "Invalid libgit2 version; this git2go supports libgit2 v0.25" #endif */ diff --git a/vendor/libgit2 b/vendor/libgit2 index a051ee3..ae5838f 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit a051ee31f2a3790410c2b482611f691135d2eae0 +Subproject commit ae5838f118a4819e608990a815bf8fc482be5772 -- cgit v1.2.3 From 5d0a4c752a74258a5f42e40fccd2908ac4e336b8 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Mon, 9 Jan 2017 22:13:18 +0000 Subject: Bump vendored libgit2 to ee89941fa --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vendor') diff --git a/vendor/libgit2 b/vendor/libgit2 index ae5838f..ee89941 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit ae5838f118a4819e608990a815bf8fc482be5772 +Subproject commit ee89941fa2b861332defb5e3a8ce12c23c496ed7 -- cgit v1.2.3 From 9f4e0a46b6f4cefd652f1e20c068e5545d7cfc9d Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Fri, 20 Jan 2017 13:13:49 +0000 Subject: Update libgit2 to df4dfaad --- describe_test.go | 6 ++++-- vendor/libgit2 | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'vendor') diff --git a/describe_test.go b/describe_test.go index f0a45f4..3181f23 100644 --- a/describe_test.go +++ b/describe_test.go @@ -93,14 +93,16 @@ func TestDescribeCommit(t *testing.T) { func checkDescribeNoRefsFound(t *testing.T, err error) { // The failure happens at wherever we were called, not here _, file, line, ok := runtime.Caller(1) + expectedString := "no reference found, cannot describe anything" if !ok { t.Fatalf("Unable to get caller") } - if err == nil || !strings.Contains(err.Error(), "No reference found, cannot describe anything") { + if err == nil || !strings.Contains(err.Error(), expectedString) { t.Fatalf( - "%s:%v: was expecting error 'No reference found, cannot describe anything', got %v", + "%s:%v: was expecting error %v, got %v", path.Base(file), line, + expectedString, err, ) } diff --git a/vendor/libgit2 b/vendor/libgit2 index ee89941..df4dfaa 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit ee89941fa2b861332defb5e3a8ce12c23c496ed7 +Subproject commit df4dfaadcf709646ebab2e57e3589952cf1ac809 -- cgit v1.2.3