From 937e2822a834a50160b8ca4e56ed4163bd803b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20David=20Ib=C3=A1=C3=B1ez?= <jdavid.ibp@gmail.com>
Date: Tue, 10 Dec 2013 21:05:52 +0100
Subject: [PATCH] merge: remove unused reference to the repository

---
 src/mergeresult.c |  3 +--
 src/mergeresult.h |  2 +-
 src/repository.c  | 15 ++++-----------
 src/types.h       |  5 ++++-
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/mergeresult.c b/src/mergeresult.c
index 1ce4497..31699c1 100644
--- a/src/mergeresult.c
+++ b/src/mergeresult.c
@@ -37,7 +37,7 @@ extern PyTypeObject MergeResultType;
 extern PyTypeObject IndexType;
 
 PyObject *
-git_merge_result_to_python(git_merge_result *merge_result, Repository *repo)
+git_merge_result_to_python(git_merge_result *merge_result)
 {
     MergeResult *py_merge_result;
 
@@ -46,7 +46,6 @@ git_merge_result_to_python(git_merge_result *merge_result, Repository *repo)
         return NULL;
 
     py_merge_result->result = merge_result;
-    py_merge_result->repo = repo;
 
     return (PyObject*) py_merge_result;
 }
diff --git a/src/mergeresult.h b/src/mergeresult.h
index 7aadac4..770a4bd 100644
--- a/src/mergeresult.h
+++ b/src/mergeresult.h
@@ -32,6 +32,6 @@
 #include <Python.h>
 #include <git2.h>
 
-PyObject* git_merge_result_to_python(git_merge_result *merge_result, Repository *repo);
+PyObject* git_merge_result_to_python(git_merge_result *merge_result);
 
 #endif
diff --git a/src/repository.c b/src/repository.c
index 2b15993..7cc746b 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -609,24 +609,17 @@ Repository_merge(Repository *self, PyObject *py_oid)
 
     err = git_merge_head_from_oid(&oid_merge_head, self->repo, &oid);
     if (err < 0)
-        goto error;
+        return Error_set(err);
 
     err = git_merge(&merge_result, self->repo,
                     (const git_merge_head **)&oid_merge_head, 1,
                     &default_opts);
-    if (err < 0) {
-        git_merge_head_free(oid_merge_head);
-        goto error;
-    }
-
-    py_merge_result = git_merge_result_to_python(merge_result, self);
-
     git_merge_head_free(oid_merge_head);
+    if (err < 0)
+        return Error_set(err);
 
+    py_merge_result = git_merge_result_to_python(merge_result);
     return py_merge_result;
-
-error:
-    return Error_set(err);
 }
 
 PyDoc_STRVAR(Repository_walk__doc__,
diff --git a/src/types.h b/src/types.h
index e69226b..c864959 100644
--- a/src/types.h
+++ b/src/types.h
@@ -218,6 +218,9 @@ typedef struct {
 } BlameHunk;
 
 /* git_merge */
-SIMPLE_TYPE(MergeResult, git_merge_result, result)
+typedef struct {
+    PyObject_HEAD
+    git_merge_result *result;
+} MergeResult;
 
 #endif