void test_index_reuc__ignore_case(void) { const git_index_reuc_entry *reuc; git_oid oid; int index_caps; index_caps = git_index_caps(repo_index); index_caps &= ~GIT_INDEXCAP_IGNORE_CASE; cl_git_pass(git_index_set_caps(repo_index, index_caps)); cl_assert(!git_index_reuc_get_bypath(repo_index, "TWO.txt")); index_caps |= GIT_INDEXCAP_IGNORE_CASE; cl_git_pass(git_index_set_caps(repo_index, index_caps)); cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "TWO.txt")); cl_assert(strcmp(reuc->path, "two.txt") == 0); cl_assert(reuc->mode[0] == 0100644); cl_assert(reuc->mode[1] == 0100644); cl_assert(reuc->mode[2] == 0100644); git_oid_fromstr(&oid, TWO_ANCESTOR_OID); cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0); git_oid_fromstr(&oid, TWO_OUR_OID); cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0); git_oid_fromstr(&oid, TWO_THEIR_OID); cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0); }
void test_index_reuc__read_bypath(void) { const git_index_reuc_entry *reuc; git_oid oid; cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index)); cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "two.txt")); cl_assert(strcmp(reuc->path, "two.txt") == 0); cl_assert(reuc->mode[0] == 0100644); cl_assert(reuc->mode[1] == 0100644); cl_assert(reuc->mode[2] == 0100644); git_oid_fromstr(&oid, TWO_ANCESTOR_OID); cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0); git_oid_fromstr(&oid, TWO_OUR_OID); cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0); git_oid_fromstr(&oid, TWO_THEIR_OID); cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0); cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "one.txt")); cl_assert(strcmp(reuc->path, "one.txt") == 0); cl_assert(reuc->mode[0] == 0100644); cl_assert(reuc->mode[1] == 0100644); cl_assert(reuc->mode[2] == 0100644); git_oid_fromstr(&oid, ONE_ANCESTOR_OID); cl_assert(git_oid_cmp(&reuc->oid[0], &oid) == 0); git_oid_fromstr(&oid, ONE_OUR_OID); cl_assert(git_oid_cmp(&reuc->oid[1], &oid) == 0); git_oid_fromstr(&oid, ONE_THEIR_OID); cl_assert(git_oid_cmp(&reuc->oid[2], &oid) == 0); }
/* 6: ancest:ancest+, head:(empty), remote:(empty) = result:no merge */ void test_merge_workdir_trivial__6_automerge(void) { const git_index_entry *entry; const git_index_reuc_entry *reuc; cl_git_pass(merge_trivial("trivial-6", "trivial-6-branch", 1)); cl_assert((entry = git_index_get_bypath(repo_index, "removed-in-both.txt", 0)) == NULL); cl_assert(git_index_reuc_entrycount(repo_index) == 1); cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "removed-in-both.txt")); cl_assert(merge_trivial_conflict_entrycount() == 0); }
void test_index_reuc__add_no_ancestor(void) { git_oid ancestor_oid, our_oid, their_oid; const git_index_reuc_entry *reuc; memset(&ancestor_oid, 0x0, sizeof(git_oid)); git_oid_fromstr(&our_oid, ONE_OUR_OID); git_oid_fromstr(&their_oid, ONE_THEIR_OID); cl_git_pass(git_index_reuc_add(repo_index, "newfile.txt", 0, NULL, 0100644, &our_oid, 0100644, &their_oid)); cl_assert(reuc = git_index_reuc_get_bypath(repo_index, "newfile.txt")); cl_assert_equal_s("newfile.txt", reuc->path); cl_assert(reuc->mode[0] == 0); cl_assert(reuc->mode[1] == 0100644); cl_assert(reuc->mode[2] == 0100644); cl_assert_equal_oid(&reuc->oid[0], &ancestor_oid); cl_assert_equal_oid(&reuc->oid[1], &our_oid); cl_assert_equal_oid(&reuc->oid[2], &their_oid); }
static int reuc_entry_exists(void) { return (git_index_reuc_get_bypath(repo_index, "newfile.txt") != NULL); }