Skip to content

Commit 6855a59

Browse files
committed
implementing merge with default options - minor change
1 parent 1f2fdca commit 6855a59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/mergeresult.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ PyDoc_STRVAR(MergeResult_fastforward_oid__doc__, "Fastforward Oid");
9090
PyObject *
9191
MergeResult_fastforward_oid__get__(MergeResult *self)
9292
{
93-
if (self->is_fastforward == 1)
93+
if (self->is_fastforward)
9494
{
9595
Py_INCREF(self->fastforward_oid);
9696
return self->fastforward_oid;
@@ -123,7 +123,7 @@ PyTypeObject MergeResultType = {
123123
"_pygit2.MergeResult", /* tp_name */
124124
sizeof(MergeResult), /* tp_basicsize */
125125
0, /* tp_itemsize */
126-
0, /* tp_dealloc */
126+
0, /* tp_dealloc */
127127
0, /* tp_print */
128128
0, /* tp_getattr */
129129
0, /* tp_setattr */

0 commit comments

Comments
 (0)