6 files changed, 22 insertions, 24 deletions

diff --git a/tests-clar/attr/repo.c b/tests-clar/attr/repo.c
index 926a0d8a2..ca3e71e7f 100644
--- a/tests-clar/attr/repo.c
+++ b/tests-clar/attr/repo.c
@@ -266,14 +266,13 @@ static void add_to_workdir(const char *filename, const char *content)
 
 static void assert_proper_normalization(git_index *index, const char *filename, const char *expected_sha)
 {
-	int index_pos;
+	size_t index_pos;
 	const git_index_entry *entry;
 
 	add_to_workdir(filename, CONTENT);
 	cl_git_pass(git_index_add_bypath(index, filename));
 
-	index_pos = git_index_find(index, filename);
-	cl_assert(index_pos >= 0);
+	cl_assert(!git_index_find(&index_pos, index, filename));
 
 	entry = git_index_get_byindex(index, index_pos);
 	cl_assert_equal_i(0, git_oid_streq(&entry->oid, expected_sha));
diff --git a/tests-clar/index/filemodes.c b/tests-clar/index/filemodes.c
index 1acd2e341..1bb44173c 100644
--- a/tests-clar/index/filemodes.c
+++ b/tests-clar/index/filemodes.c
@@ -53,13 +53,12 @@ static void replace_file_with_mode(
 static void add_and_check_mode(
 	git_index *index, const char *filename, unsigned int expect_mode)
 {
-	int pos;
+	size_t pos;
 	const git_index_entry *entry;
 
 	cl_git_pass(git_index_add_bypath(index, filename));
 
-	pos = git_index_find(index, filename);
-	cl_assert(pos >= 0);
+	cl_assert(!git_index_find(&pos, index, filename));
 
 	entry = git_index_get_byindex(index, pos);
 	cl_assert(entry->mode == expect_mode);
diff --git a/tests-clar/index/rename.c b/tests-clar/index/rename.c
index 400bbdf15..4deef1332 100644
--- a/tests-clar/index/rename.c
+++ b/tests-clar/index/rename.c
@@ -5,7 +5,7 @@ void test_index_rename__single_file(void)
 {
 	git_repository *repo;
 	git_index *index;
-	int position;
+	size_t position;
 	git_oid expected;
 	const git_index_entry *entry;
 
@@ -24,7 +24,7 @@ void test_index_rename__single_file(void)
 
 	cl_git_pass(git_oid_fromstr(&expected, "d4fa8600b4f37d7516bef4816ae2c64dbf029e3a"));
 
-	position = git_index_find(index, "lame.name.txt");
+	cl_assert(!git_index_find(&position, index, "lame.name.txt"));
 
 	entry = git_index_get_byindex(index, position);
 	cl_assert(git_oid_cmp(&expected, &entry->oid) == 0);
@@ -38,7 +38,7 @@ void test_index_rename__single_file(void)
 	cl_git_pass(git_index_add_bypath(index, "fancy.name.txt"));
 	cl_assert(git_index_entrycount(index) == 1);
 
-	position = git_index_find(index, "fancy.name.txt");
+	cl_assert(!git_index_find(&position, index, "fancy.name.txt"));
 
 	entry = git_index_get_byindex(index, position);
 	cl_assert(git_oid_cmp(&expected, &entry->oid) == 0);
diff --git a/tests-clar/index/stage.c b/tests-clar/index/stage.c
index 477456846..58dc1fb5e 100644
--- a/tests-clar/index/stage.c
+++ b/tests-clar/index/stage.c
@@ -26,36 +26,36 @@ void test_index_stage__cleanup(void)
 
 void test_index_stage__add_always_adds_stage_0(void)
 {
-	int entry_idx;
+	size_t entry_idx;
 	const git_index_entry *entry;
 
     cl_git_mkfile("./mergedrepo/new-file.txt", "new-file\n");
 
 	cl_git_pass(git_index_add_bypath(repo_index, "new-file.txt"));
 
-	cl_assert((entry_idx = git_index_find(repo_index, "new-file.txt")) >= 0);
+	cl_assert(!git_index_find(&entry_idx, repo_index, "new-file.txt"));
 	cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL);
 	cl_assert(git_index_entry_stage(entry) == 0);
 }
 
 void test_index_stage__find_gets_first_stage(void)
 {
-	int entry_idx;
+	size_t entry_idx;
 	const git_index_entry *entry;
 
-	cl_assert((entry_idx = git_index_find(repo_index, "one.txt")) >= 0);
+	cl_assert(!git_index_find(&entry_idx, repo_index, "one.txt"));
 	cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL);
 	cl_assert(git_index_entry_stage(entry) == 0);
 
-	cl_assert((entry_idx = git_index_find(repo_index, "two.txt")) >= 0);
+	cl_assert(!git_index_find(&entry_idx, repo_index, "two.txt"));
 	cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL);
 	cl_assert(git_index_entry_stage(entry) == 0);
 
-	cl_assert((entry_idx = git_index_find(repo_index, "conflicts-one.txt")) >= 0);
+	cl_assert(!git_index_find(&entry_idx, repo_index, "conflicts-one.txt"));
 	cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL);
 	cl_assert(git_index_entry_stage(entry) == 1);
 
-	cl_assert((entry_idx = git_index_find(repo_index, "conflicts-two.txt")) >= 0);
+	cl_assert(!git_index_find(&entry_idx, repo_index, "conflicts-two.txt"));
 	cl_assert((entry = git_index_get_byindex(repo_index, entry_idx)) != NULL);
 	cl_assert(git_index_entry_stage(entry) == 1);
 }
diff --git a/tests-clar/index/tests.c b/tests-clar/index/tests.c
index 3c2a6899c..64f547ead 100644
--- a/tests-clar/index/tests.c
+++ b/tests-clar/index/tests.c
@@ -10,7 +10,7 @@ static const size_t index_entry_count_2 = 1437;
 
 // Suite data
 struct test_entry {
-   int index;
+   size_t index;
    char path[128];
    git_off_t file_size;
    git_time_t mtime;
@@ -131,8 +131,10 @@ void test_index_tests__find_in_existing(void)
    cl_git_pass(git_index_open(&index, TEST_INDEX_PATH));
 
    for (i = 0; i < ARRAY_SIZE(test_entries); ++i) {
-      int idx = git_index_find(index, test_entries[i].path);
-      cl_assert(idx == test_entries[i].index);
+	  size_t idx;
+
+	  cl_assert(!git_index_find(&idx, index, test_entries[i].path));
+	  cl_assert(idx == test_entries[i].index);
    }
 
    git_index_free(index);
@@ -146,8 +148,7 @@ void test_index_tests__find_in_empty(void)
    cl_git_pass(git_index_open(&index, "fake-index"));
 
    for (i = 0; i < ARRAY_SIZE(test_entries); ++i) {
-      int idx = git_index_find(index, test_entries[i].path);
-      cl_assert(idx == GIT_ENOTFOUND);
+      cl_assert(GIT_ENOTFOUND == git_index_find(NULL, index, test_entries[i].path));
    }
 
    git_index_free(index);
diff --git a/tests-clar/submodule/status.c b/tests-clar/submodule/status.c
index 325013466..3fd6960c9 100644
--- a/tests-clar/submodule/status.c
+++ b/tests-clar/submodule/status.c
@@ -100,11 +100,10 @@ void test_submodule_status__ignore_none(void)
 	/* remove sm_changed_head from index */
 	{
 		git_index *index;
-		int pos;
+		size_t pos;
 
 		cl_git_pass(git_repository_index(&index, g_repo));
-		pos = git_index_find(index, "sm_changed_head");
-		cl_assert(pos >= 0);
+		cl_assert(!git_index_find(&pos, index, "sm_changed_head"));
 		cl_git_pass(git_index_remove(index, "sm_changed_head", 0));
 		cl_git_pass(git_index_write(index));