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

Checkout Payload Pointer Fix 

- Tracking pointer once
- Tracking pointer and not struct
This commit is contained in:
Mirko Nosenzo 2016-06-25 11:30:35 +02:00
parent 18802c24e3
commit 6fa4c8ea15
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
checkout.go
View File

@ -74,10 +74,10 @@ func checkoutOptionsFromC(c *C.git_checkout_options) CheckoutOpts {
opts.FileOpenFlags = int(c.file_open_flags) opts.FileOpenFlags = int(c.file_open_flags)
opts.NotifyFlags = CheckoutNotifyType(c.notify_flags) opts.NotifyFlags = CheckoutNotifyType(c.notify_flags)
if c.notify_payload != nil { if c.notify_payload != nil {
opts.NotifyCallback = pointerHandles.Get(c.notify_payload).(CheckoutOpts).NotifyCallback opts.NotifyCallback = pointerHandles.Get(c.notify_payload).(*CheckoutOpts).NotifyCallback
} }
if c.progress_payload != nil { if c.progress_payload != nil {
opts.ProgressCallback = pointerHandles.Get(c.progress_payload).(CheckoutOpts).ProgressCallback opts.ProgressCallback = pointerHandles.Get(c.progress_payload).(*CheckoutOpts).ProgressCallback
} }
if c.target_directory != nil { if c.target_directory != nil {
opts.TargetDirectory = C.GoString(c.target_directory) opts.TargetDirectory = C.GoString(c.target_directory)
@ -110,7 +110,7 @@ func checkoutNotifyCallback(why C.git_checkout_notify_t, cpath *C.char, cbaselin
if cworkdir != nil { if cworkdir != nil {
workdir = diffFileFromC((*C.git_diff_file)(cworkdir)) workdir = diffFileFromC((*C.git_diff_file)(cworkdir))
} }
opts := pointerHandles.Get(data).(CheckoutOpts) opts := pointerHandles.Get(data).(*CheckoutOpts)
if opts.NotifyCallback == nil { if opts.NotifyCallback == nil {
return 0 return 0
} }
@ -122,7 +122,7 @@ func checkoutProgressCallback(path *C.char, completed_steps, total_steps C.size_
if data == nil { if data == nil {
return 0 return 0
} }
opts := pointerHandles.Get(data).(CheckoutOpts) opts := pointerHandles.Get(data).(*CheckoutOpts)
if opts.ProgressCallback == nil { if opts.ProgressCallback == nil {
return 0 return 0
} }
@ -146,11 +146,12 @@ func populateCheckoutOpts(ptr *C.git_checkout_options, opts *CheckoutOpts) *C.gi
if opts.NotifyCallback != nil || opts.ProgressCallback != nil { if opts.NotifyCallback != nil || opts.ProgressCallback != nil {
C._go_git_populate_checkout_cb(ptr) C._go_git_populate_checkout_cb(ptr)
} }
payload := pointerHandles.Track(opts)
if opts.NotifyCallback != nil { if opts.NotifyCallback != nil {
ptr.notify_payload = pointerHandles.Track(*opts) ptr.notify_payload = payload
} }
if opts.ProgressCallback != nil { if opts.ProgressCallback != nil {
ptr.progress_payload = pointerHandles.Track(*opts) ptr.progress_payload = payload
} }
if opts.TargetDirectory != "" { if opts.TargetDirectory != "" {
ptr.target_directory = C.CString(opts.TargetDirectory) ptr.target_directory = C.CString(opts.TargetDirectory)
@ -178,9 +179,6 @@ func freeCheckoutOpts(ptr *C.git_checkout_options) {
if ptr.notify_payload != nil { if ptr.notify_payload != nil {
pointerHandles.Untrack(ptr.notify_payload) pointerHandles.Untrack(ptr.notify_payload)
} }
if ptr.progress_payload != nil {
pointerHandles.Untrack(ptr.progress_payload)
}
} }
// 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