summaryrefslogtreecommitdiff
path: root/diff.go
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2016-02-18 15:43:58 +0100
committerCarlos Martín Nieto <[email protected]>2016-02-18 15:43:58 +0100
commit4a9a59c6faef3a75fa9e0528cbc704cfd5c1edd9 (patch)
tree321c99e1104749b2d3a3b19f7ad906e4bcdfbbdf /diff.go
parent6d6736b2bd4e23a68fa5e0703ab9cf20f3f32af3 (diff)
parent090dc7ee3901d08d46b02d42b4f1fe248ecc3e6c (diff)
Merge commit 'refs/pull/285/head' of github.com:libgit2/git2go into next
Diffstat (limited to 'diff.go')
-rw-r--r--diff.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff.go b/diff.go
index de56374..565fcee 100644
--- a/diff.go
+++ b/diff.go
@@ -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)
}
}
}