From 419bac9075cd0967b09f4e0f9884a1d87298c2e3 Mon Sep 17 00:00:00 2001 From: lhchavez Date: Thu, 13 Feb 2020 03:06:01 +0000 Subject: 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 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mempack.go') 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 } -- cgit v1.2.3