Exemplo n.º 1
0
PyObject *
MergeResult_is_uptodate__get__(MergeResult *self)
{
    if (git_merge_result_is_uptodate(self->result))
        Py_RETURN_TRUE;
    else
        Py_RETURN_FALSE;
}
Exemplo n.º 2
0
void test_merge_workdir_fastforward__uptodate_merging_prev_commit(void)
{
    git_oid their_oid;
    git_merge_head *their_heads[1];
    git_merge_result *result;

    cl_git_pass(git_oid_fromstr(&their_oid, "c607fc30883e335def28cd686b51f6cfa02b06ec"));
    cl_git_pass(git_merge_head_from_oid(&their_heads[0], repo, &their_oid));

    cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, NULL));

    cl_assert(git_merge_result_is_uptodate(result));

    git_merge_head_free(their_heads[0]);
    git_merge_result_free(result);
}
Exemplo n.º 3
0
void test_merge_workdir_fastforward__uptodate(void)
{
    git_reference *their_ref;
    git_merge_head *their_heads[1];
    git_merge_result *result;

    cl_git_pass(git_reference_lookup(&their_ref, repo, GIT_HEAD_FILE));
    cl_git_pass(git_merge_head_from_ref(&their_heads[0], repo, their_ref));

    cl_git_pass(git_merge(&result, repo, (const git_merge_head **)their_heads, 1, NULL));

    cl_assert(git_merge_result_is_uptodate(result));

    git_merge_head_free(their_heads[0]);
    git_reference_free(their_ref);
    git_merge_result_free(result);
}