summaryrefslogtreecommitdiff
path: root/patch.go
diff options
context:
space:
mode:
authorlhchavez <[email protected]>2020-02-23 13:53:17 +0000
committerlhchavez <[email protected]>2020-02-23 13:53:17 +0000
commitc20008416a64e2ae884a14332b258160a261a5df (patch)
tree58ae95d9f007937876eed1aac89b0518a034e442 /patch.go
parent79fe156d307a9c7b294aa92c741dc0c2759a1894 (diff)
parent4bca045e5aa98b0b791fb467705de0692fe3514f (diff)
Merge remote-tracking branch 'upstream/master' into git_index_add_frombuffer
Diffstat (limited to 'patch.go')
-rw-r--r--patch.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/patch.go b/patch.go
index 75e843c..6a16b5f 100644
--- a/patch.go
+++ b/patch.go
@@ -51,7 +51,7 @@ func (patch *Patch) String() (string, error) {
if ecode < 0 {
return "", MakeGitError(ecode)
}
- defer C.git_buf_free(&buf)
+ defer C.git_buf_dispose(&buf)
return C.GoString(buf.ptr), nil
}
@@ -69,7 +69,7 @@ func (v *Repository) PatchFromBuffers(oldPath, newPath string, oldBuf, newBuf []
var patchPtr *C.git_patch
oldPtr := toPointer(oldBuf)
- newPtr := (*C.char)(toPointer(newBuf))
+ newPtr := toPointer(newBuf)
cOldPath := C.CString(oldPath)
defer C.free(unsafe.Pointer(cOldPath))