openstack/deb-python-pygit2
Code Issues Proposed changes

implementing merge with default options - minor change

Browse Source
This commit is contained in:
Victor Garcia
2013-12-04 23:49:26 +01:00
parent 1f2fdca2c1
commit 6855a599e4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mergeresult.c
View File

@@ -90,7 +90,7 @@ PyDoc_STRVAR(MergeResult_fastforward_oid__doc__, "Fastforward Oid");
PyObject * PyObject *
MergeResult_fastforward_oid__get__(MergeResult *self) MergeResult_fastforward_oid__get__(MergeResult *self)
{ {
if (self->is_fastforward == 1) if (self->is_fastforward)
{ {
Py_INCREF(self->fastforward_oid); Py_INCREF(self->fastforward_oid);
return self->fastforward_oid; return self->fastforward_oid;
@@ -123,7 +123,7 @@ PyTypeObject MergeResultType = {
"_pygit2.MergeResult", /* tp_name */ "_pygit2.MergeResult", /* tp_name */
sizeof(MergeResult), /* tp_basicsize */ sizeof(MergeResult), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
0, /* tp_dealloc */ 0, /* tp_dealloc */
0, /* tp_print */ 0, /* tp_print */
0, /* tp_getattr */ 0, /* tp_getattr */
0, /* tp_setattr */ 0, /* tp_setattr */