Commit 43eeca04a7fe00332fe8c4723e29fa82a5304b13
2012-11-01T20:24:43
index: Fix tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93
diff --git a/src/index.c b/src/index.c
index 73fd40a..ffa63f6 100644
--- a/src/index.c
+++ b/src/index.c
@@ -430,7 +430,6 @@ int git_index_read(git_index *index)
int git_index_write(git_index *index)
{
git_filebuf file = GIT_FILEBUF_INIT;
- struct stat indexst;
int error;
if (!index->index_file_path) {
@@ -473,7 +472,7 @@ int git_index_write_tree(git_oid *oid, git_index *index)
if (repo == NULL) {
giterr_set(GITERR_INDEX, "Failed to write tree. "
"The index file is not backed up by an existing repository");
- return -1
+ return -1;
}
return git_tree__write_index(oid, index, repo);
diff --git a/src/stash.c b/src/stash.c
index 9c9c5dc..1d6940e 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -115,7 +115,7 @@ static int build_tree_from_index(git_tree **out, git_index *index)
{
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 git_tree_lookup(out, git_index_owner(index), &i_tree_oid);
diff --git a/src/tree.c b/src/tree.c
index dd9f948..46b4a6d 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -494,7 +494,6 @@ on_error:
int git_tree__write_index(git_oid *oid, git_index *index, git_repository *repo)
{
int ret;
- git_repository *repo;
assert(oid && index && repo);
diff --git a/tests-clar/index/read_tree.c b/tests-clar/index/read_tree.c
index f63a54b..3ae883d 100644
--- a/tests-clar/index/read_tree.c
+++ b/tests-clar/index/read_tree.c
@@ -29,14 +29,14 @@ void test_index_read_tree__read_write_involution(void)
cl_git_pass(git_index_add_from_workdir(index, "abc/d"));
/* write-tree */
- cl_git_pass(git_tree_create_fromindex(&expected, index));
+ cl_git_pass(git_index_write_tree(&expected, index));
/* read-tree */
git_tree_lookup(&tree, repo, &expected);
cl_git_pass(git_index_read_tree(index, 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);
git_index_free(index);
diff --git a/tests-clar/object/commit/commitstagedfile.c b/tests-clar/object/commit/commitstagedfile.c
index ac38acf..eb78ced 100644
--- a/tests-clar/object/commit/commitstagedfile.c
+++ b/tests-clar/object/commit/commitstagedfile.c
@@ -99,7 +99,7 @@ void test_object_commit_commitstagedfile__generate_predictable_object_ids(void)
/*
* 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);
diff --git a/tests-clar/stash/stash_helpers.c b/tests-clar/stash/stash_helpers.c
index 0e93ecf..000a0f1 100644
--- a/tests-clar/stash/stash_helpers.c
+++ b/tests-clar/stash/stash_helpers.c
@@ -13,7 +13,7 @@ void commit_staged_files(
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_commit_create_v(