diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2013-01-12 13:47:56 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2013-01-12 13:47:56 -0600 |
| commit | 25743bd7c5f14f2287d9c4fdf953c978e3b16916 (patch) | |
| tree | 7390d1d2d5d52f549329853903f381e58c1b1de6 /tests-clar/index/rename.c | |
| parent | e2d2c6e57d122f381fb42b7df1c7a12819050490 (diff) | |
| download | libgit2-25743bd7c5f14f2287d9c4fdf953c978e3b16916.tar.gz | |
add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match
Diffstat (limited to 'tests-clar/index/rename.c')
| -rw-r--r-- | tests-clar/index/rename.c | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |