Merge branch 'catchupTo66af84' into custom_odb

Conflicts:
	git.go
	reference.go
	repository.go
	submodule.go

1 files changed, 10 insertions, 10 deletions

diff --git a/git.go b/git.go
index 28196c8..406ecb7 100644
--- a/git.go
+++ b/git.go
@@ -10,8 +10,8 @@ import (
 	"bytes"
 	"errors"
 	"runtime"
-	"unsafe"
 	"strings"
+	"unsafe"
 )
 
 const (
@@ -93,7 +93,7 @@ func (oid *Oid) Equal(oid2 *Oid) bool {
 }
 
 func (oid *Oid) IsZero() bool {
-	for _, a := range(oid.bytes) {
+	for _, a := range oid.bytes {
 		if a != '0' {
 			return false
 		}
@@ -131,10 +131,10 @@ func ShortenOids(ids []*Oid, minlen int) (int, error) {
 
 type GitError struct {
 	Message string
-	Code int
+	Code    int
 }
 
-func (e GitError) Error() string{
+func (e GitError) Error() string {
 	return e.Message
 }
 
@@ -147,14 +147,14 @@ func LastError() error {
 }
 
 func cbool(b bool) C.int {
-	if (b) {
+	if b {
 		return C.int(1)
 	}
 	return C.int(0)
 }
 
 func ucbool(b bool) C.uint {
-	if (b) {
+	if b {
 		return C.uint(1)
 	}
 	return C.uint(0)
@@ -167,16 +167,16 @@ func Discover(start string, across_fs bool, ceiling_dirs []string) (string, erro
 	cstart := C.CString(start)
 	defer C.free(unsafe.Pointer(cstart))
 
-	retpath := (*C.char)(C.malloc(C.GIT_PATH_MAX))
-	defer C.free(unsafe.Pointer(retpath))
+	retpath := (*C.git_buf)(C.malloc(C.GIT_PATH_MAX))
+	defer C.git_buf_free(retpath)
 
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	r := C.git_repository_discover(retpath, C.GIT_PATH_MAX, cstart, cbool(across_fs), ceildirs)
+	r := C.git_repository_discover(retpath, cstart, cbool(across_fs), ceildirs)
 
 	if r == 0 {
-		return C.GoString(retpath), nil
+		return C.GoString(retpath.ptr), nil
 	}
 
 	return "", LastError()