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

More diff functionality #629

Merged
mbfr merged 24 commits from feature-diff-extra into master 2020-08-18 08:14:03 -05:00
Conversation 0 Commits 24 Files Changed 3 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fff6c9d8ae - Show all commits

6
diff.go
View File

@ -865,7 +865,7 @@ type ApplyOptions struct {
//export hunkApplyCallback //export hunkApplyCallback
func hunkApplyCallback(_hunk *C.git_diff_hunk, _payload unsafe.Pointer) C.int { func hunkApplyCallback(_hunk *C.git_diff_hunk, _payload unsafe.Pointer) C.int {
opts, ok := pointerHandles.Get(_payload).(ApplyOptions) opts, ok := pointerHandles.Get(_payload).(*ApplyOptions)
if !ok { if !ok {
panic("invalid apply options payload") panic("invalid apply options payload")
} }
@ -888,7 +888,7 @@ func hunkApplyCallback(_hunk *C.git_diff_hunk, _payload unsafe.Pointer) C.int {
//export deltaApplyCallback //export deltaApplyCallback
func deltaApplyCallback(_delta *C.git_diff_delta, _payload unsafe.Pointer) C.int { func deltaApplyCallback(_delta *C.git_diff_delta, _payload unsafe.Pointer) C.int {
opts, ok := pointerHandles.Get(_payload).(ApplyOptions) opts, ok := pointerHandles.Get(_payload).(*ApplyOptions)
if !ok { if !ok {
panic("invalid apply options payload") panic("invalid apply options payload")
} }
@ -929,7 +929,7 @@ func (a *ApplyOptions) toC() *C.git_apply_options {
if a.ApplyDeltaCallback != nil || a.ApplyHunkCallback != nil { if a.ApplyDeltaCallback != nil || a.ApplyHunkCallback != nil {
C._go_git_populate_apply_cb(opts) C._go_git_populate_apply_cb(opts)
opts.payload = pointerHandles.Track(*a) opts.payload = pointerHandles.Track(a)
} }
return opts return opts