diff options
Diffstat (limited to 'tests-clar/index/rename.c')
| -rw-r--r-- | tests-clar/index/rename.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests-clar/index/rename.c b/tests-clar/index/rename.c index eecd257fd..4deef1332 100644 --- a/tests-clar/index/rename.c +++ b/tests-clar/index/rename.c @@ -5,9 +5,9 @@ void test_index_rename__single_file(void) { git_repository *repo; git_index *index; - int position; + size_t position; git_oid expected; - git_index_entry *entry; + const git_index_entry *entry; p_mkdir("rename", 0700); @@ -19,28 +19,28 @@ void test_index_rename__single_file(void) cl_git_mkfile("./rename/lame.name.txt", "new_file\n"); /* This should add a new blob to the object database in 'd4/fa8600b4f37d7516bef4816ae2c64dbf029e3a' */ - cl_git_pass(git_index_add(index, "lame.name.txt", 0)); + cl_git_pass(git_index_add_bypath(index, "lame.name.txt")); cl_assert(git_index_entrycount(index) == 1); 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(index, position); + entry = git_index_get_byindex(index, position); cl_assert(git_oid_cmp(&expected, &entry->oid) == 0); /* This removes the entry from the index, but not from the object database */ - cl_git_pass(git_index_remove(index, position)); + cl_git_pass(git_index_remove(index, "lame.name.txt", 0)); cl_assert(git_index_entrycount(index) == 0); p_rename("./rename/lame.name.txt", "./rename/fancy.name.txt"); - cl_git_pass(git_index_add(index, "fancy.name.txt", 0)); + 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(index, position); + entry = git_index_get_byindex(index, position); cl_assert(git_oid_cmp(&expected, &entry->oid) == 0); git_index_free(index); |