diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-18 04:56:57 +0400 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-18 04:56:57 +0400 |
| commit | ddcb28a41f3774e26fc6ae0a7174a5565e4749ce (patch) | |
| tree | a80eb78456d71dadeb13da82a53a31022b697f94 /tests-clar/status | |
| parent | 3a93ab90658ea46fd2f581172b313a1de711ce65 (diff) | |
| parent | 25743bd7c5f14f2287d9c4fdf953c978e3b16916 (diff) | |
Merge pull request #1239 from ethomson/index_remove
add an index_remove_bypath that removes conflicts
Diffstat (limited to 'tests-clar/status')
| -rw-r--r-- | tests-clar/status/worktree_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests-clar/status/worktree_init.c b/tests-clar/status/worktree_init.c index 6d790b1c9..0c34dde87 100644 --- a/tests-clar/status/worktree_init.c +++ b/tests-clar/status/worktree_init.c @@ -38,7 +38,7 @@ void test_status_worktree_init__first_commit_in_progress(void) cl_assert(result.status == GIT_STATUS_WT_NEW); cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_from_workdir(index, "testfile.txt")); + cl_git_pass(git_index_add_bypath(index, "testfile.txt")); cl_git_pass(git_index_write(index)); memset(&result, 0, sizeof(result)); @@ -172,7 +172,7 @@ void test_status_worktree_init__bracket_in_filename(void) /* add the file to the index */ cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_from_workdir(index, FILE_WITH_BRACKET)); + cl_git_pass(git_index_add_bypath(index, FILE_WITH_BRACKET)); cl_git_pass(git_index_write(index)); memset(&result, 0, sizeof(result)); @@ -251,7 +251,7 @@ void test_status_worktree_init__space_in_filename(void) /* add the file to the index */ cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_from_workdir(index, FILE_WITH_SPACE)); + cl_git_pass(git_index_add_bypath(index, FILE_WITH_SPACE)); cl_git_pass(git_index_write(index)); memset(&result, 0, sizeof(result)); @@ -329,7 +329,7 @@ void test_status_worktree_init__new_staged_file_must_handle_crlf(void) cl_git_mkfile("getting_started/testfile.txt", "content\r\n"); // Content with CRLF cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_index_add_from_workdir(index, "testfile.txt")); + cl_git_pass(git_index_add_bypath(index, "testfile.txt")); cl_git_pass(git_index_write(index)); cl_git_pass(git_status_file(&status, repo, "testfile.txt")); |