Merge branch 'master' into custom_odb

1 files changed, 7 insertions, 0 deletions

diff --git a/checkout.go b/checkout.go
index 63637e2..f4c1d4e 100644
--- a/checkout.go
+++ b/checkout.go
@@ -9,6 +9,7 @@ git_checkout_opts git_checkout_opts_init() {
 */
 import "C"
 import (
+	"runtime"
 	"os"
 )
 
@@ -59,6 +60,9 @@ func (v *Repository) Checkout(opts *CheckoutOpts) error {
 	var copts C.git_checkout_opts
 	populateCheckoutOpts(&copts, opts)
 
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_checkout_head(v.ptr, &copts)
 	if ret < 0 {
 		return LastError()
@@ -72,6 +76,9 @@ func (v *Repository) CheckoutIndex(index *Index, opts *CheckoutOpts) error {
 	var copts C.git_checkout_opts
 	populateCheckoutOpts(&copts, opts)
 
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_checkout_index(v.ptr, index.ptr, &copts)
 	if ret < 0 {
 		return LastError()