merge with latest, replace merge wrappers with go code

1 files changed, 15 insertions, 6 deletions

diff --git a/walk.go b/walk.go
index cdc1a20..71df7bb 100644
--- a/walk.go
+++ b/walk.go
@@ -14,11 +14,12 @@ import (
 // RevWalk
 
 type SortType uint
+
 const (
-	SortNone SortType = C.GIT_SORT_NONE
-	SortTopological   = C.GIT_SORT_TOPOLOGICAL
-	SortTime          = C.GIT_SORT_TIME
-	SortReverse       = C.GIT_SORT_REVERSE
+	SortNone        SortType = C.GIT_SORT_NONE
+	SortTopological          = C.GIT_SORT_TOPOLOGICAL
+	SortTime                 = C.GIT_SORT_TIME
+	SortReverse              = C.GIT_SORT_REVERSE
 )
 
 type RevWalk struct {
@@ -26,6 +27,12 @@ type RevWalk struct {
 	repo *Repository
 }
 
+func revWalkFromC(repo *Repository, c *C.git_revwalk) *RevWalk {
+	v := &RevWalk{ptr: c, repo: repo}
+	runtime.SetFinalizer(v, (*RevWalk).Free)
+	return v
+}
+
 func (v *RevWalk) Reset() {
 	C.git_revwalk_reset(v.ptr)
 }
@@ -92,6 +99,8 @@ func (v *RevWalk) Sorting(sm SortType) {
 	C.git_revwalk_sorting(v.ptr, C.uint(sm))
 }
 
-func freeRevWalk(walk *RevWalk) {
-	C.git_revwalk_free(walk.ptr)
+func (v *RevWalk) Free() {
+
+	runtime.SetFinalizer(v, nil)
+	C.git_revwalk_free(v.ptr)
 }