From d69c7714530f12ec9b45578d5f06813d974f7ef2 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Thu, 18 Dec 2014 14:08:11 -0800 Subject: Update libgit2 Fix calls to C.git_treebuilder_create and C.git_treebuilder_write. --- repository.go | 4 ++-- tree.go | 2 +- vendor/libgit2 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/repository.go b/repository.go index 2baeb4a..b9fb4b5 100644 --- a/repository.go +++ b/repository.go @@ -456,7 +456,7 @@ func (v *Repository) TreeBuilder() (*TreeBuilder, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() - if ret := C.git_treebuilder_create(&bld.ptr, nil); ret < 0 { + if ret := C.git_treebuilder_create(&bld.ptr, v.ptr, nil); ret < 0 { return nil, MakeGitError(ret) } runtime.SetFinalizer(bld, (*TreeBuilder).Free) @@ -471,7 +471,7 @@ func (v *Repository) TreeBuilderFromTree(tree *Tree) (*TreeBuilder, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() - if ret := C.git_treebuilder_create(&bld.ptr, tree.cast_ptr); ret < 0 { + if ret := C.git_treebuilder_create(&bld.ptr, v.ptr, tree.cast_ptr); ret < 0 { return nil, MakeGitError(ret) } runtime.SetFinalizer(bld, (*TreeBuilder).Free) diff --git a/tree.go b/tree.go index efabce5..c18d02a 100644 --- a/tree.go +++ b/tree.go @@ -161,7 +161,7 @@ func (v *TreeBuilder) Write() (*Oid, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() - err := C.git_treebuilder_write(oid.toC(), v.repo.ptr, v.ptr) + err := C.git_treebuilder_write(oid.toC(), v.ptr) if err < 0 { return nil, MakeGitError(err) diff --git a/vendor/libgit2 b/vendor/libgit2 index 4eb97ef..247b3f4 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 4eb97ef3bf18403fbce351ae4cac673655d2886a +Subproject commit 247b3f4ee5d08ee5f5f88eb1c0f6ed03cbd21fc9 -- cgit v1.2.3