index: Fix tests

6 files changed, 6 insertions, 8 deletions

diff --git a/src/index.c b/src/index.c
index 73fd40acf..ffa63f6a7 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 9c9c5dce7..1d6940e3c 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 dd9f94869..46b4a6dd1 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 f63a54bf2..3ae883d18 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 ac38acf5b..eb78cedaa 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 0e93ecff0..000a0f1a9 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(