Merge remote-tracking branch 'upstream/master' into git_index_add_frombuffer

1 files changed, 5 insertions, 11 deletions

diff --git a/git.go b/git.go
index 0925e45..968d404 100644
--- a/git.go
+++ b/git.go
@@ -189,22 +189,16 @@ func (oid *Oid) Cmp(oid2 *Oid) int {
 }
 
 func (oid *Oid) Copy() *Oid {
-	ret := new(Oid)
-	copy(ret[:], oid[:])
-	return ret
+	ret := *oid
+	return &ret
 }
 
 func (oid *Oid) Equal(oid2 *Oid) bool {
-	return bytes.Equal(oid[:], oid2[:])
+	return *oid == *oid2
 }
 
 func (oid *Oid) IsZero() bool {
-	for _, a := range oid {
-		if a != 0 {
-			return false
-		}
-	}
-	return true
+	return *oid == Oid{}
 }
 
 func (oid *Oid) NCmp(oid2 *Oid, n uint) int {
@@ -309,7 +303,7 @@ func Discover(start string, across_fs bool, ceiling_dirs []string) (string, erro
 	defer C.free(unsafe.Pointer(cstart))
 
 	var buf C.git_buf
-	defer C.git_buf_free(&buf)
+	defer C.git_buf_dispose(&buf)
 
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()