Merge branch 'master' into custom_odb

Conflicts:
	odb.go
	wrapper.c

1 files changed, 8 insertions, 8 deletions

diff --git a/odb.go b/odb.go
index 80f8312..3b0c864 100644
--- a/odb.go
+++ b/odb.go
@@ -63,7 +63,7 @@ func (v *Odb) Write(data []byte, otype ObjectType) (oid *Oid, err error) {
 	ret := C.git_odb_write(oid.toC(), v.ptr, unsafe.Pointer(hdr.Data), C.size_t(hdr.Len), C.git_otype(otype))
 
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 
 	return oid, nil
@@ -77,7 +77,7 @@ func (v *Odb) Read(oid *Oid) (obj *OdbObject, err error) {
 
 	ret := C.git_odb_read(&obj.ptr, v.ptr, oid.toC())
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 
 	runtime.SetFinalizer(obj, (*OdbObject).Free)
@@ -121,7 +121,7 @@ func (v *Odb) Hash(data []byte, otype ObjectType) (oid *Oid, err error) {
 
 	ret := C.git_odb_hash(oid.toC(), ptr, C.size_t(header.Len), C.git_otype(otype));
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 	return oid, nil
 }
@@ -132,7 +132,7 @@ func (v *Odb) NewReadStream(id *Oid) (*OdbReadStream, error) {
 	stream := new(OdbReadStream)
 	ret := C.git_odb_open_rstream(&stream.ptr, v.ptr, id.toC())
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 
 	runtime.SetFinalizer(stream, (*OdbReadStream).Free)
@@ -146,7 +146,7 @@ func (v *Odb) NewWriteStream(size int, otype ObjectType) (*OdbWriteStream, error
 	stream := new(OdbWriteStream)
 	ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.size_t(size), C.git_otype(otype))
 	if ret < 0 {
-		return nil, LastError()
+		return nil, MakeGitError(ret)
 	}
 
 	runtime.SetFinalizer(stream, (*OdbWriteStream).Free)
@@ -199,7 +199,7 @@ func (stream *OdbReadStream) Read(data []byte) (int, error) {
 	size := C.size_t(header.Cap)
 	ret := C.git_odb_stream_read(stream.ptr, ptr, size)
 	if ret < 0 {
-		return 0, LastError()
+		return 0, MakeGitError(ret)
 	}
 
 	header.Len = int(ret)
@@ -231,7 +231,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
 
 	ret := C.git_odb_stream_write(stream.ptr, ptr, size)
 	if ret < 0 {
-		return 0, LastError()
+		return 0, MakeGitError(ret)
 	}
 
 	return len(data), nil
@@ -242,7 +242,7 @@ func (stream *OdbWriteStream) Write(data []byte) (int, error) {
 func (stream *OdbWriteStream) Close() error {
 	ret := C.git_odb_stream_finalize_write(stream.Id.toC(), stream.ptr)
 	if ret < 0 {
-		return LastError()
+		return MakeGitError(ret)
 	}
 
 	return nil