static int rebase_next_inmemory( git_rebase_operation **out, git_rebase *rebase) { git_commit *current_commit = NULL, *parent_commit = NULL; git_tree *current_tree = NULL, *head_tree = NULL, *parent_tree = NULL; git_rebase_operation *operation; git_index *index = NULL; unsigned int parent_count; int error; *out = NULL; operation = git_array_get(rebase->operations, rebase->current); if ((error = git_commit_lookup(¤t_commit, rebase->repo, &operation->id)) < 0 || (error = git_commit_tree(¤t_tree, current_commit)) < 0) goto done; if ((parent_count = git_commit_parentcount(current_commit)) > 1) { giterr_set(GITERR_REBASE, "Cannot rebase a merge commit"); error = -1; goto done; } else if (parent_count) { if ((error = git_commit_parent(&parent_commit, current_commit, 0)) < 0 || (error = git_commit_tree(&parent_tree, parent_commit)) < 0) goto done; } if ((error = git_commit_tree(&head_tree, rebase->last_commit)) < 0 || (error = git_merge_trees(&index, rebase->repo, parent_tree, head_tree, current_tree, &rebase->options.merge_options)) < 0) goto done; if (!rebase->index) { rebase->index = index; index = NULL; } else { if ((error = git_index_read_index(rebase->index, index)) < 0) goto done; } *out = operation; done: git_commit_free(current_commit); git_commit_free(parent_commit); git_tree_free(current_tree); git_tree_free(head_tree); git_tree_free(parent_tree); git_index_free(index); return error; }
void test_index_read_index__maintains_stat_cache(void) { git_index *new_index; git_oid index_id; git_index_entry new_entry; const git_index_entry *e; git_tree *tree; size_t i; cl_assert_equal_i(4, git_index_entrycount(_index)); /* write-tree */ cl_git_pass(git_index_write_tree(&index_id, _index)); /* read-tree, then read index */ git_tree_lookup(&tree, _repo, &index_id); cl_git_pass(git_index_new(&new_index)); cl_git_pass(git_index_read_tree(new_index, tree)); git_tree_free(tree); /* add a new entry that will not have stat data */ memset(&new_entry, 0, sizeof(git_index_entry)); new_entry.path = "Hello"; git_oid_fromstr(&new_entry.id, "0123456789012345678901234567890123456789"); new_entry.file_size = 1234; new_entry.mode = 0100644; cl_git_pass(git_index_add(new_index, &new_entry)); cl_assert_equal_i(5, git_index_entrycount(new_index)); cl_git_pass(git_index_read_index(_index, new_index)); git_index_free(new_index); cl_assert_equal_i(5, git_index_entrycount(_index)); for (i = 0; i < git_index_entrycount(_index); i++) { e = git_index_get_byindex(_index, i); if (strcmp(e->path, "Hello") == 0) { cl_assert_equal_i(0, e->ctime.seconds); cl_assert_equal_i(0, e->mtime.seconds); } else { cl_assert(0 != e->ctime.seconds); cl_assert(0 != e->mtime.seconds); } } }
static bool roundtrip_with_read_index(const char *tree_idstr) { git_oid tree_id, new_tree_id; git_tree *tree; git_index *tree_index; cl_git_pass(git_oid_fromstr(&tree_id, tree_idstr)); cl_git_pass(git_tree_lookup(&tree, _repo, &tree_id)); cl_git_pass(git_index_new(&tree_index)); cl_git_pass(git_index_read_tree(tree_index, tree)); cl_git_pass(git_index_read_index(_index, tree_index)); cl_git_pass(git_index_write_tree(&new_tree_id, _index)); git_tree_free(tree); git_index_free(tree_index); return git_oid_equal(&tree_id, &new_tree_id); }
void test_index_racy__read_index_smudges(void) { git_index *index, *newindex; const git_index_entry *entry; /* if we are reading an index into our new index, ensure that any * racy entries in the index that we're reading are smudged so that * we don't propagate their timestamps without further investigation. */ setup_race(); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_new(&newindex)); cl_git_pass(git_index_read_index(newindex, index)); cl_assert(entry = git_index_get_bypath(newindex, "A", 0)); cl_assert_equal_i(0, entry->file_size); git_index_free(index); git_index_free(newindex); }
void test_index_read_index__read_and_writes(void) { git_oid tree_id, new_tree_id; git_tree *tree; git_index *tree_index, *new_index; cl_git_pass(git_oid_fromstr(&tree_id, "ae90f12eea699729ed24555e40b9fd669da12a12")); cl_git_pass(git_tree_lookup(&tree, _repo, &tree_id)); cl_git_pass(git_index_new(&tree_index)); cl_git_pass(git_index_read_tree(tree_index, tree)); cl_git_pass(git_index_read_index(_index, tree_index)); cl_git_pass(git_index_write(_index)); cl_git_pass(git_index_open(&new_index, git_index_path(_index))); cl_git_pass(git_index_write_tree_to(&new_tree_id, new_index, _repo)); cl_assert_equal_oid(&tree_id, &new_tree_id); git_tree_free(tree); git_index_free(tree_index); git_index_free(new_index); }
void test_index_racy__read_index_clears_uptodate_bit(void) { git_index *index, *newindex; const git_index_entry *entry; setup_uptodate_files(); cl_git_pass(git_repository_index(&index, g_repo)); cl_git_pass(git_index_new(&newindex)); cl_git_pass(git_index_read_index(newindex, index)); /* ensure that files brought in from the other index are not uptodate */ cl_assert((entry = git_index_get_bypath(newindex, "A", 0))); cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE)); cl_assert((entry = git_index_get_bypath(newindex, "B", 0))); cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE)); cl_assert((entry = git_index_get_bypath(newindex, "C", 0))); cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE)); git_index_free(index); git_index_free(newindex); }
void test_index_read_index__handles_conflicts(void) { git_oid tree_id; git_tree *tree; git_index *index, *new_index; git_index_conflict_iterator *conflict_iterator; const git_index_entry *ancestor, *ours, *theirs; cl_git_pass(git_oid_fromstr(&tree_id, "ae90f12eea699729ed24555e40b9fd669da12a12")); cl_git_pass(git_tree_lookup(&tree, _repo, &tree_id)); cl_git_pass(git_index_new(&index)); cl_git_pass(git_index_new(&new_index)); cl_git_pass(git_index_read_tree(index, tree)); cl_git_pass(git_index_read_tree(new_index, tree)); /* put some conflicts in only the old side, these should be removed */ add_conflicts(index, "orig_side-1.txt"); add_conflicts(index, "orig_side-2.txt"); /* put some conflicts in both indexes, these should be unchanged */ add_conflicts(index, "both_sides-1.txt"); add_conflicts(new_index, "both_sides-1.txt"); add_conflicts(index, "both_sides-2.txt"); add_conflicts(new_index, "both_sides-2.txt"); /* put some conflicts in the new index, these should be added */ add_conflicts(new_index, "new_side-1.txt"); add_conflicts(new_index, "new_side-2.txt"); cl_git_pass(git_index_read_index(index, new_index)); cl_git_pass(git_index_conflict_iterator_new(&conflict_iterator, index)); cl_git_pass(git_index_conflict_next( &ancestor, &ours, &theirs, conflict_iterator)); cl_assert_equal_s("both_sides-1.txt", ancestor->path); cl_assert_equal_s("both_sides-1.txt", ours->path); cl_assert_equal_s("both_sides-1.txt", theirs->path); cl_git_pass(git_index_conflict_next( &ancestor, &ours, &theirs, conflict_iterator)); cl_assert_equal_s("both_sides-2.txt", ancestor->path); cl_assert_equal_s("both_sides-2.txt", ours->path); cl_assert_equal_s("both_sides-2.txt", theirs->path); cl_git_pass(git_index_conflict_next( &ancestor, &ours, &theirs, conflict_iterator)); cl_assert_equal_s("new_side-1.txt", ancestor->path); cl_assert_equal_s("new_side-1.txt", ours->path); cl_assert_equal_s("new_side-1.txt", theirs->path); cl_git_pass(git_index_conflict_next( &ancestor, &ours, &theirs, conflict_iterator)); cl_assert_equal_s("new_side-2.txt", ancestor->path); cl_assert_equal_s("new_side-2.txt", ours->path); cl_assert_equal_s("new_side-2.txt", theirs->path); cl_git_fail_with(GIT_ITEROVER, git_index_conflict_next( &ancestor, &ours, &theirs, conflict_iterator)); git_index_conflict_iterator_free(conflict_iterator); git_tree_free(tree); git_index_free(new_index); git_index_free(index); }