diff options
| author | Carlos Martín Nieto <[email protected]> | 2016-03-07 11:17:10 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2016-03-07 11:22:53 +0100 |
| commit | 2ae7d13ba1037c7fa579fc52263ea280b37244ea (patch) | |
| tree | f2509df04ec4e6187943aad83ea672e660102a8b /diff.go | |
| parent | fa644d2fc9efa3baee93b525212d76dfa17a5db5 (diff) | |
| parent | e095c85fd06b5820d2f0098ff3e66b266553dbd5 (diff) | |
Merge branch 'next'
Diffstat (limited to 'diff.go')
| -rw-r--r-- | diff.go | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -550,7 +550,7 @@ func diffOptionsToC(opts *DiffOptions) (copts *C.git_diff_options, notifyData *d if opts.NotifyCallback != nil { C._go_git_setup_diff_notify_callbacks(copts) - copts.notify_payload = pointerHandles.Track(notifyData) + copts.payload = pointerHandles.Track(notifyData) } } return @@ -562,8 +562,8 @@ func freeDiffOptions(copts *C.git_diff_options) { freeStrarray(&cpathspec) C.free(unsafe.Pointer(copts.old_prefix)) C.free(unsafe.Pointer(copts.new_prefix)) - if copts.notify_payload != nil { - pointerHandles.Untrack(copts.notify_payload) + if copts.payload != nil { + pointerHandles.Untrack(copts.payload) } } } |
