From 419bac9075cd0967b09f4e0f9884a1d87298c2e3 Mon Sep 17 00:00:00 2001
From: lhchavez <lhchavez@lhchavez.com>
Date: Thu, 13 Feb 2020 03:06:01 +0000
Subject: [PATCH] Uprev libgit2

This uprevs libgit2 to the latest and greatest. Notably,

* Fixes the interface of `git_mempack_reset`, since it now returns an
  `int` instead of being `void`.

Fixes: #533
---
 mempack.go     | 13 ++++++++++---
 vendor/libgit2 |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mempack.go b/mempack.go
index 337e67d..bdea224 100644
--- a/mempack.go
+++ b/mempack.go
@@ -6,7 +6,7 @@ package git
 
 extern int git_mempack_new(git_odb_backend **out);
 extern int git_mempack_dump(git_buf *pack, git_repository *repo, git_odb_backend *backend);
-extern void git_mempack_reset(git_odb_backend *backend);
+extern int git_mempack_reset(git_odb_backend *backend);
 extern void _go_git_odb_backend_free(git_odb_backend *backend);
 */
 import "C"
@@ -79,6 +79,13 @@ func (mempack *Mempack) Dump(repository *Repository) ([]byte, error) {
 //
 // This assumes that Mempack.Dump has been called before to store all the
 // queued objects into a single packfile.
-func (mempack *Mempack) Reset() {
-	C.git_mempack_reset(mempack.ptr)
+func (mempack *Mempack) Reset() error {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
+	ret := C.git_mempack_reset(mempack.ptr)
+	if ret < 0 {
+		return MakeGitError(ret)
+	}
+	return nil
 }
diff --git a/vendor/libgit2 b/vendor/libgit2
index 6777db8..ee3307a 160000
--- a/vendor/libgit2
+++ b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 6777db8e8343014d57c41b335e0c60af44d4e9f2
+Subproject commit ee3307a183e39d602b25fa94831c6fc09e7c1b61