implementing merge - some fixes for the pull request: MergeRestul typedef, pep7 fixes and some error checks

Author: victorgp

src/repository.c

@@ -613,9 +613,8 @@ Repository_merge(Repository *self, PyObject *py_oid)
     err = git_merge(&merge_result, self->repo,
                     (const git_merge_head **)&oid_merge_head, 1,
                     &default_opts);
-    if (err < 0)
-    {
-        git_merge_result_free(merge_result);
+    if (err < 0) {
+        git_merge_head_free(oid_merge_head);
         goto error;
     }
 
@@ -627,7 +626,6 @@ Repository_merge(Repository *self, PyObject *py_oid)
     return py_merge_result;
 
 error:
-    git_merge_head_free(oid_merge_head);
     return Error_set(err);
 }
 

src/types.h

@@ -218,13 +218,6 @@ typedef struct {
 } BlameHunk;
 
 /* git_merge */
-typedef struct {
-	PyObject_HEAD
-	int is_uptodate;
-	int is_fastforward;
-	PyObject* fastforward_oid;
-	PyObject* status;
-	
-} MergeResult;
+SIMPLE_TYPE(MergeResult, git_merge_result, result)
 
 #endif