Merge branch 'master' into custom_odb

1 files changed, 7 insertions, 0 deletions

diff --git a/walk.go b/walk.go
index 9fc4094..6979b6b 100644
--- a/walk.go
+++ b/walk.go
@@ -8,6 +8,7 @@ import "C"
 
 import (
 	"io"
+	"runtime"
 )
 
 // RevWalk
@@ -34,6 +35,9 @@ func (v *RevWalk) Push(id *Oid) {
 }
 
 func (v *RevWalk) PushHead() (err error) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ecode := C.git_revwalk_push_head(v.ptr)
 	if ecode < 0 {
 		err = LastError()
@@ -43,6 +47,9 @@ func (v *RevWalk) PushHead() (err error) {
 }
 
 func (v *RevWalk) Next(oid *Oid) (err error) {
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_revwalk_next(oid.toC(), v.ptr)
 	switch {
 	case ret == ITEROVER: