diff options
| author | Calin Seciu <[email protected]> | 2016-02-20 14:52:57 +0200 |
|---|---|---|
| committer | Calin Seciu <[email protected]> | 2016-02-20 14:52:57 +0200 |
| commit | c6f394e407a8f119eea191e1321f61828921f164 (patch) | |
| tree | 6b4ab4bbd263388f0384b029b2a770189782b9d0 /checkout.go | |
| parent | dc4409793db0205ce7c0783a10363d7d67aee674 (diff) | |
| parent | 251d89e1d41037185df0ea89e9aab208efc40d4e (diff) | |
Merge branch 'next' into stash-support
Diffstat (limited to 'checkout.go')
| -rw-r--r-- | checkout.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/checkout.go b/checkout.go index ce2f469..a2e312b 100644 --- a/checkout.go +++ b/checkout.go @@ -45,6 +45,7 @@ type CheckoutOpts struct { FileOpenFlags int // Default is O_CREAT | O_TRUNC | O_WRONLY TargetDirectory string // Alternative checkout path to workdir Paths []string + Baseline *Tree } func checkoutOptionsFromC(c *C.git_checkout_options) CheckoutOpts { @@ -90,6 +91,10 @@ func populateCheckoutOpts(ptr *C.git_checkout_options, opts *CheckoutOpts) *C.gi ptr.paths.count = C.size_t(len(opts.Paths)) } + if opts.Baseline != nil { + ptr.baseline = opts.Baseline.cast_ptr + } + return ptr } |
