openstack/deb-python-pygit2
Code Issues Proposed changes

fixed parameter order for diff functions (libgit2)

Browse Source
This commit is contained in:
Nico von Geyso
2012-11-16 13:04:47 +01:00
parent e3a71d4f41
commit 5262c9e23b
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pygit2/index.c
View File

@@ -117,15 +117,17 @@ Index_diff_tree(Index *self, PyObject *args)
if (py_obj == NULL) { if (py_obj == NULL) {
err = git_diff_workdir_to_index( err = git_diff_workdir_to_index(
&diff,
self->repo->repo, self->repo->repo,
&opts, self->index,
&diff); &opts);
} else if (PyObject_TypeCheck(py_obj, &TreeType)) { } else if (PyObject_TypeCheck(py_obj, &TreeType)) {
err = git_diff_index_to_tree( err = git_diff_index_to_tree(
&diff,
self->repo->repo, self->repo->repo,
&opts,
((Tree *)py_obj)->tree, ((Tree *)py_obj)->tree,
&diff); self->index,
&opts);
} else { } else {
PyErr_SetObject(PyExc_TypeError, py_obj); PyErr_SetObject(PyExc_TypeError, py_obj);
return NULL; return NULL;

15
src/pygit2/tree.c
View File

@@ -279,23 +279,24 @@ Tree_diff_tree(Tree *self, PyObject *args)
if (py_obj == NULL) { if (py_obj == NULL) {
err = git_diff_workdir_to_tree( err = git_diff_workdir_to_tree(
&diff,
self->repo->repo, self->repo->repo,
&opts,
self->tree, self->tree,
&diff); &opts);
} else if (PyObject_TypeCheck(py_obj, &TreeType)) { } else if (PyObject_TypeCheck(py_obj, &TreeType)) {
err = git_diff_tree_to_tree( err = git_diff_tree_to_tree(
&diff,
self->repo->repo, self->repo->repo,
&opts,
self->tree, self->tree,
((Tree *)py_obj)->tree, ((Tree *)py_obj)->tree,
&diff); &opts);
} else if (PyObject_TypeCheck(py_obj, &IndexType)) { } else if (PyObject_TypeCheck(py_obj, &IndexType)) {
err = git_diff_index_to_tree( err = git_diff_index_to_tree(
((Index *)py_obj)->repo->repo, &diff,
&opts, self->repo->repo,
self->tree, self->tree,
&diff); ((Index *)py_obj)->index,
&opts);
} else { } else {
PyErr_SetObject(PyExc_TypeError, py_obj); PyErr_SetObject(PyExc_TypeError, py_obj);
return NULL; return NULL;