update to new merge API

1 files changed, 14 insertions, 5 deletions

diff --git a/checkout.go b/checkout.go
index 5b72b9a..456c302 100644
--- a/checkout.go
+++ b/checkout.go
@@ -5,8 +5,8 @@ package git
 */
 import "C"
 import (
-	"runtime"
 	"os"
+	"runtime"
 )
 
 type CheckoutStrategy uint
@@ -32,10 +32,19 @@ const (
 
 type CheckoutOpts struct {
 	Strategy       CheckoutStrategy // Default will be a dry run
-	DisableFilters bool				// Don't apply filters like CRLF conversion
-	DirMode        os.FileMode		// Default is 0755
-	FileMode       os.FileMode		// Default is 0644 or 0755 as dictated by blob
-	FileOpenFlags  int				// Default is O_CREAT | O_TRUNC | O_WRONLY
+	DisableFilters bool             // Don't apply filters like CRLF conversion
+	DirMode        os.FileMode      // Default is 0755
+	FileMode       os.FileMode      // Default is 0644 or 0755 as dictated by blob
+	FileOpenFlags  int              // Default is O_CREAT | O_TRUNC | O_WRONLY
+}
+
+func (opts *CheckoutOpts) toC() *C.git_checkout_options {
+	if opts == nil {
+		return nil
+	}
+	c := C.git_checkout_options{}
+	populateCheckoutOpts(&c, opts)
+	return &c
 }
 
 // Convert the CheckoutOpts struct to the corresponding