jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Adjust to checkout_opts -> checkout_options

This commit is contained in:
Carlos Martín Nieto 2014-03-11 03:09:48 +01:00
parent 731f978b54
commit 42fce02197
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkout.go
View File

@ -2,8 +2,8 @@ package git
/* /*
#include <git2.h> #include <git2.h>
git_checkout_opts git_checkout_opts_init() { git_checkout_options git_checkout_opts_init() {
git_checkout_opts ret = GIT_CHECKOUT_OPTS_INIT; git_checkout_options ret = GIT_CHECKOUT_OPTIONS_INIT;
return ret; return ret;
} }
*/ */
@ -43,7 +43,7 @@ type CheckoutOpts struct {
} }
// Convert the CheckoutOpts struct to the corresponding C-struct // Convert the CheckoutOpts struct to the corresponding C-struct
func populateCheckoutOpts(ptr *C.git_checkout_opts, opts *CheckoutOpts) { func populateCheckoutOpts(ptr *C.git_checkout_options, opts *CheckoutOpts) {
*ptr = C.git_checkout_opts_init() *ptr = C.git_checkout_opts_init()
if opts == nil { if opts == nil {
return return
@ -57,7 +57,7 @@ func populateCheckoutOpts(ptr *C.git_checkout_opts, opts *CheckoutOpts) {
// Updates files in the index and the working tree to match the content of // Updates files in the index and the working tree to match the content of
// the commit pointed at by HEAD. // the commit pointed at by HEAD.
func (v *Repository) Checkout(opts *CheckoutOpts) error { func (v *Repository) Checkout(opts *CheckoutOpts) error {
var copts C.git_checkout_opts var copts C.git_checkout_options
populateCheckoutOpts(&copts, opts) populateCheckoutOpts(&copts, opts)
runtime.LockOSThread() runtime.LockOSThread()
@ -73,7 +73,7 @@ func (v *Repository) Checkout(opts *CheckoutOpts) error {
// Updates files in the working tree to match the content of the index. // Updates files in the working tree to match the content of the index.
func (v *Repository) CheckoutIndex(index *Index, opts *CheckoutOpts) error { func (v *Repository) CheckoutIndex(index *Index, opts *CheckoutOpts) error {
var copts C.git_checkout_opts var copts C.git_checkout_options
populateCheckoutOpts(&copts, opts) populateCheckoutOpts(&copts, opts)
runtime.LockOSThread() runtime.LockOSThread()