summaryrefslogtreecommitdiff
path: root/cherrypick.go
diff options
context:
space:
mode:
Diffstat (limited to 'cherrypick.go')
-rw-r--r--cherrypick.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cherrypick.go b/cherrypick.go
index 675e0dd..7ef1666 100644
--- a/cherrypick.go
+++ b/cherrypick.go
@@ -12,7 +12,7 @@ type CherrypickOptions struct {
Version uint
Mainline uint
MergeOpts MergeOptions
- CheckoutOpts CheckoutOpts
+ CheckoutOpts CheckoutOptions
}
func cherrypickOptionsFromC(c *C.git_cherrypick_options) CherrypickOptions {
@@ -41,7 +41,7 @@ func freeCherrypickOpts(ptr *C.git_cherrypick_options) {
if ptr == nil {
return
}
- freeCheckoutOpts(&ptr.checkout_opts)
+ freeCheckoutOptions(&ptr.checkout_opts)
}
func DefaultCherrypickOptions() (CherrypickOptions, error) {