示例#1
0
PyObject *
MergeResult_fastforward_oid__get__(MergeResult *self)
{
    if (git_merge_result_is_fastforward(self->result)) {
        git_oid fastforward_oid;
        git_merge_result_fastforward_oid(&fastforward_oid, self->result);
        return git_oid_to_python((const git_oid *)&fastforward_oid);
    }
    else Py_RETURN_NONE;
}
示例#2
0
void test_merge_workdir_fastforward__fastforward(void)
{
    git_merge_result *result;
    git_oid expected, ff_oid;

    cl_git_pass(git_oid_fromstr(&expected, THEIRS_FASTFORWARD_OID));

    cl_assert(result = merge_fastforward_branch(0));
    cl_assert(git_merge_result_is_fastforward(result));
    cl_git_pass(git_merge_result_fastforward_oid(&ff_oid, result));
    cl_assert(git_oid_cmp(&ff_oid, &expected) == 0);

    git_merge_result_free(result);
}