void test_index_names__roundtrip(void) { const git_index_name_entry *conflict_name; cl_git_pass(git_index_name_add(repo_index, "ancestor", "ours", "theirs")); cl_git_pass(git_index_name_add(repo_index, "ancestor2", "ours2", NULL)); cl_git_pass(git_index_name_add(repo_index, "ancestor3", NULL, "theirs3")); cl_git_pass(git_index_write(repo_index)); git_index_clear(repo_index); cl_assert(git_index_name_entrycount(repo_index) == 0); cl_git_pass(git_index_read(repo_index, true)); cl_assert(git_index_name_entrycount(repo_index) == 3); conflict_name = git_index_name_get_byindex(repo_index, 0); cl_assert(strcmp(conflict_name->ancestor, "ancestor") == 0); cl_assert(strcmp(conflict_name->ours, "ours") == 0); cl_assert(strcmp(conflict_name->theirs, "theirs") == 0); conflict_name = git_index_name_get_byindex(repo_index, 1); cl_assert(strcmp(conflict_name->ancestor, "ancestor2") == 0); cl_assert(strcmp(conflict_name->ours, "ours2") == 0); cl_assert(conflict_name->theirs == NULL); conflict_name = git_index_name_get_byindex(repo_index, 2); cl_assert(strcmp(conflict_name->ancestor, "ancestor3") == 0); cl_assert(conflict_name->ours == NULL); cl_assert(strcmp(conflict_name->theirs, "theirs3") == 0); }
void test_index_names__retained_on_checkout_index(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; test_index_names__add(); git_checkout_index(repo, repo_index, &opts); cl_assert(git_index_name_entrycount(repo_index) > 0); }
void test_index_names__cleaned_on_checkout_head(void) { git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; test_index_names__add(); git_checkout_head(repo, &opts); cl_assert_equal_sz(0, git_index_name_entrycount(repo_index)); }
void test_index_names__cleaned_on_reset_mixed(void) { git_object *target; cl_git_pass(git_revparse_single(&target, repo, "3a34580")); test_index_names__add(); cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL, NULL)); cl_assert(git_index_name_entrycount(repo_index) == 0); git_object_free(target); }
void merge__dump_names(git_index *index) { size_t i; const git_index_name_entry *conflict_name; for (i = 0; i < git_index_name_entrycount(index); i++) { conflict_name = git_index_name_get_byindex(index, i); printf("%s %s %s\n", conflict_name->ancestor, conflict_name->ours, conflict_name->theirs); } printf("\n"); }
void test_index_names__cleaned_on_checkout_tree(void) { git_oid oid; git_object *obj; git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_UPDATE_ONLY; test_index_names__add(); git_reference_name_to_id(&oid, repo, "refs/heads/master"); git_object_lookup(&obj, repo, &oid, GIT_OBJ_ANY); git_checkout_tree(repo, obj, &opts); cl_assert_equal_sz(0, git_index_name_entrycount(repo_index)); git_object_free(obj); }
int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len) { size_t i; const git_index_name_entry *name_entry; /* dump_names(index); */ if (git_index_name_entrycount(index) != expected_len) return 0; for (i = 0; i < expected_len; i++) { if ((name_entry = git_index_name_get_byindex(index, i)) == NULL) return 0; if (! name_entry_eq_merge_name_entry(&expected[i], name_entry)) return 0; } return 1; }