proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-10-14 09:56:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

index: Fix tests

Browse Source
This commit is contained in:
Vicent Marti 2012-11-01 20:24:43 +01:00
parent 276ea401b3
commit 43eeca04a7
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/index.c
View File

@ -430,7 +430,6 @@ int git_index_read(git_index *index)
int git_index_write(git_index *index) int git_index_write(git_index *index)
{ {
git_filebuf file = GIT_FILEBUF_INIT; git_filebuf file = GIT_FILEBUF_INIT;
struct stat indexst;
int error; int error;
if (!index->index_file_path) { if (!index->index_file_path) {
@ -473,7 +472,7 @@ int git_index_write_tree(git_oid *oid, git_index *index)
if (repo == NULL) { if (repo == NULL) {
giterr_set(GITERR_INDEX, "Failed to write tree. " giterr_set(GITERR_INDEX, "Failed to write tree. "
"The index file is not backed up by an existing repository"); "The index file is not backed up by an existing repository");
return -1 return -1;
} }
return git_tree__write_index(oid, index, repo); return git_tree__write_index(oid, index, repo);

2
src/stash.c
View File

@ -115,7 +115,7 @@ static int build_tree_from_index(git_tree **out, git_index *index)
{ {
git_oid i_tree_oid; git_oid i_tree_oid;
if (git_tree_create_fromindex(&i_tree_oid, index) < 0) if (git_index_write_tree(&i_tree_oid, index) < 0)
return -1; return -1;
return git_tree_lookup(out, git_index_owner(index), &i_tree_oid); return git_tree_lookup(out, git_index_owner(index), &i_tree_oid);

1
src/tree.c
View File

@ -494,7 +494,6 @@ on_error:
int git_tree__write_index(git_oid *oid, git_index *index, git_repository *repo) int git_tree__write_index(git_oid *oid, git_index *index, git_repository *repo)
{ {
int ret; int ret;
git_repository *repo;
assert(oid && index && repo); assert(oid && index && repo);

4
tests-clar/index/read_tree.c
View File

@ -29,14 +29,14 @@ void test_index_read_tree__read_write_involution(void)
cl_git_pass(git_index_add_from_workdir(index, "abc/d")); cl_git_pass(git_index_add_from_workdir(index, "abc/d"));
/* write-tree */ /* write-tree */
cl_git_pass(git_tree_create_fromindex(&expected, index)); cl_git_pass(git_index_write_tree(&expected, index));
/* read-tree */ /* read-tree */
git_tree_lookup(&tree, repo, &expected); git_tree_lookup(&tree, repo, &expected);
cl_git_pass(git_index_read_tree(index, tree)); cl_git_pass(git_index_read_tree(index, tree));
git_tree_free(tree); git_tree_free(tree);
cl_git_pass(git_tree_create_fromindex(&tree_oid, index)); cl_git_pass(git_index_write_tree(&tree_oid, index));
cl_assert(git_oid_cmp(&expected, &tree_oid) == 0); cl_assert(git_oid_cmp(&expected, &tree_oid) == 0);
git_index_free(index); git_index_free(index);

2
tests-clar/object/commit/commitstagedfile.c
View File

@ -99,7 +99,7 @@ void test_object_commit_commitstagedfile__generate_predictable_object_ids(void)
/* /*
* Build the tree from the index * Build the tree from the index
*/ */
cl_git_pass(git_tree_create_fromindex(&tree_oid, index)); cl_git_pass(git_index_write_tree(&tree_oid, index));
cl_assert(git_oid_cmp(&expected_tree_oid, &tree_oid) == 0); cl_assert(git_oid_cmp(&expected_tree_oid, &tree_oid) == 0);

2
tests-clar/stash/stash_helpers.c
View File

@ -13,7 +13,7 @@ void commit_staged_files(
repo = git_index_owner(index); repo = git_index_owner(index);
cl_git_pass(git_tree_create_fromindex(&tree_oid, index)); cl_git_pass(git_index_write_tree(&tree_oid, index));
cl_git_pass(git_tree_lookup(&tree, repo, &tree_oid)); cl_git_pass(git_tree_lookup(&tree, repo, &tree_oid));
cl_git_pass(git_commit_create_v( cl_git_pass(git_commit_create_v(