Merge branch 'master' into custom_odb

1 files changed, 12 insertions, 0 deletions

diff --git a/config.go b/config.go
index 7235716..2aa073a 100644
--- a/config.go
+++ b/config.go
@@ -19,6 +19,9 @@ func (c *Config) LookupInt32(name string) (v int32, err error) {
 	cname := C.CString(name)
 	defer C.free(unsafe.Pointer(cname))
 
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_config_get_int32(&out, c.ptr, cname)
 	if ret < 0 {
 		return 0, LastError()
@@ -32,6 +35,9 @@ func (c *Config) LookupInt64(name string) (v int64, err error) {
 	cname := C.CString(name)
 	defer C.free(unsafe.Pointer(cname))
 
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_config_get_int64(&out, c.ptr, cname)
 	if ret < 0 {
 		return 0, LastError()
@@ -45,6 +51,9 @@ func (c *Config) LookupString(name string) (v string, err error) {
 	cname := C.CString(name)
 	defer C.free(unsafe.Pointer(cname))
 
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_config_get_string(&ptr, c.ptr, cname)
 	if ret < 0 {
 		return "", LastError()
@@ -60,6 +69,9 @@ func (c *Config) Set(name, value string) (err error) {
 	cvalue := C.CString(value)
 	defer C.free(unsafe.Pointer(cvalue))
 
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	ret := C.git_config_set_string(c.ptr, cname, cvalue)
 	if ret < 0 {
 		return LastError()