From 5262c9e23b9cbcc6bb2066a27d8adc17dd333403 Mon Sep 17 00:00:00 2001
From: Nico von Geyso <Nico.Geyso@FU-Berlin.de>
Date: Fri, 16 Nov 2012 13:04:47 +0100
Subject: [PATCH] fixed parameter order for diff functions (libgit2)

---
 src/pygit2/index.c | 10 ++++++----
 src/pygit2/tree.c  | 15 ++++++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/pygit2/index.c b/src/pygit2/index.c
index 8681bd3..e800733 100644
--- a/src/pygit2/index.c
+++ b/src/pygit2/index.c
@@ -117,15 +117,17 @@ Index_diff_tree(Index *self, PyObject *args)
 
     if (py_obj == NULL) {
         err = git_diff_workdir_to_index(
+                &diff,
                 self->repo->repo,
-                &opts,
-                &diff);
+                self->index,
+                &opts);
     } else if (PyObject_TypeCheck(py_obj, &TreeType)) {
         err = git_diff_index_to_tree(
+                &diff,
                 self->repo->repo,
-                &opts,
                 ((Tree *)py_obj)->tree,
-                &diff);
+                self->index,
+                &opts);
     } else {
         PyErr_SetObject(PyExc_TypeError, py_obj);
         return NULL;
diff --git a/src/pygit2/tree.c b/src/pygit2/tree.c
index 76cefcb..097c609 100644
--- a/src/pygit2/tree.c
+++ b/src/pygit2/tree.c
@@ -279,23 +279,24 @@ Tree_diff_tree(Tree *self, PyObject *args)
 
     if (py_obj == NULL) {
         err = git_diff_workdir_to_tree(
+                &diff,
                 self->repo->repo,
-                &opts,
                 self->tree,
-                &diff);
+                &opts);
     } else if (PyObject_TypeCheck(py_obj, &TreeType)) {
         err = git_diff_tree_to_tree(
+                &diff,
                 self->repo->repo,
-                &opts,
                 self->tree,
                 ((Tree *)py_obj)->tree,
-                &diff);
+                &opts);
     } else if (PyObject_TypeCheck(py_obj, &IndexType)) {
         err = git_diff_index_to_tree(
-                ((Index *)py_obj)->repo->repo,
-                &opts,
+                &diff,
+                self->repo->repo,
                 self->tree,
-                &diff);
+                ((Index *)py_obj)->index,
+                &opts);
     } else {
         PyErr_SetObject(PyExc_TypeError, py_obj);
         return NULL;