merge with latest, replace merge wrappers with go code

1 files changed, 7 insertions, 8 deletions

diff --git a/wrapper.c b/wrapper.c
index 66e10bd..973da79 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -25,18 +25,17 @@ int _go_git_odb_foreach(git_odb *db, void *payload)
     return git_odb_foreach(db, (git_odb_foreach_cb)&odbForEachCb, payload);
 }
 
-git_merge_head** _go_git_make_merge_head_array(size_t len)
+int _go_blob_chunk_cb(char *buffer, size_t maxLen, void *payload)
 {
-	return (git_merge_head**)malloc(sizeof(git_merge_head*) * len);
+    return blobChunkCb(buffer, maxLen, payload);
 }
 
-void _go_git_merge_head_array_set(git_merge_head** array, git_merge_head* ptr, size_t n)
+int _go_git_blob_create_fromchunks(git_oid *id,
+	git_repository *repo,
+	const char *hintpath,
+	void *payload)
 {
-	array[n] = ptr;
+    return git_blob_create_fromchunks(id, repo, hintpath, _go_blob_chunk_cb, payload);
 }
 
-git_merge_head* _go_git_merge_head_array_get(git_merge_head** array, size_t n)
-{
-	return array[n];	
-}
 /* EOF */