From f45ec1a076e2347ba5d63eeb2d158f87b612e5cb Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Mon, 29 Oct 2012 20:04:21 -0500 Subject: index refactoring --- tests-clar/index/rename.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tests-clar/index/rename.c') diff --git a/tests-clar/index/rename.c b/tests-clar/index/rename.c index eecd257fd..e16ec00c1 100644 --- a/tests-clar/index/rename.c +++ b/tests-clar/index/rename.c @@ -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_from_workdir(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"); - 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_from_workdir(index, "fancy.name.txt")); cl_assert(git_index_entrycount(index) == 1); position = git_index_find(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); -- cgit v1.2.3 From f45d51ff8e04c6849413c13aedcf5abacc3c69bd Mon Sep 17 00:00:00 2001 From: Ben Straub Date: Tue, 20 Nov 2012 19:57:46 -0700 Subject: API updates for index.h --- tests-clar/index/rename.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests-clar/index/rename.c') diff --git a/tests-clar/index/rename.c b/tests-clar/index/rename.c index e16ec00c1..adbbcfaac 100644 --- a/tests-clar/index/rename.c +++ b/tests-clar/index/rename.c @@ -7,7 +7,7 @@ void test_index_rename__single_file(void) git_index *index; int position; git_oid expected; - git_index_entry *entry; + const git_index_entry *entry; p_mkdir("rename", 0700); -- cgit v1.2.3 From 25743bd7c5f14f2287d9c4fdf953c978e3b16916 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Sat, 12 Jan 2013 13:47:56 -0600 Subject: add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match --- tests-clar/index/rename.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests-clar/index/rename.c') diff --git a/tests-clar/index/rename.c b/tests-clar/index/rename.c index adbbcfaac..400bbdf15 100644 --- a/tests-clar/index/rename.c +++ b/tests-clar/index/rename.c @@ -19,7 +19,7 @@ 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_from_workdir(index, "lame.name.txt")); + 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")); @@ -35,7 +35,7 @@ void test_index_rename__single_file(void) p_rename("./rename/lame.name.txt", "./rename/fancy.name.txt"); - cl_git_pass(git_index_add_from_workdir(index, "fancy.name.txt")); + 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"); -- cgit v1.2.3 From 11d9f6b30438a141def883b0115f7f764c03e990 Mon Sep 17 00:00:00 2001 From: Philip Kelley Date: Sun, 27 Jan 2013 14:17:07 -0500 Subject: Vector improvements and their fallout --- tests-clar/index/rename.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests-clar/index/rename.c') 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); -- cgit v1.2.3