diff options
| author | Vicent Martà <vicent@github.com> | 2012-11-14 02:13:47 +0400 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2012-11-14 02:13:47 +0400 |
| commit | aa1c3b588edae7c6d718e85bce54d990c69cd535 (patch) | |
| tree | 3004114ad897d7c8070f9c588feb96af86d0261f /tests-clar/stash | |
| parent | 262274748f1c3cb6de4fa621100033eda6984166 (diff) | |
| parent | 757b406504021b3a73e52ce9f95d590d65c7dce5 (diff) | |
Merge pull request #1016 from arrbee/fix-checkout-dir-removal
Update checkout with new strategies & behavior
Diffstat (limited to 'tests-clar/stash')
| -rw-r--r-- | tests-clar/stash/drop.c | 2 | ||||
| -rw-r--r-- | tests-clar/stash/foreach.c | 4 | ||||
| -rw-r--r-- | tests-clar/stash/save.c | 2 | ||||
| -rw-r--r-- | tests-clar/stash/stash_helpers.c | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c index 5bbc7452a..39139ccae 100644 --- a/tests-clar/stash/drop.c +++ b/tests-clar/stash/drop.c @@ -15,7 +15,7 @@ void test_stash_drop__cleanup(void) { git_signature_free(signature); git_repository_free(repo); - cl_git_pass(git_futils_rmdir_r("stash", NULL, GIT_DIRREMOVAL_FILES_AND_DIRS)); + cl_git_pass(git_futils_rmdir_r("stash", NULL, GIT_RMDIR_REMOVE_FILES)); } void test_stash_drop__cannot_drop_from_an_empty_stash(void) diff --git a/tests-clar/stash/foreach.c b/tests-clar/stash/foreach.c index 818d906e7..d7127a9db 100644 --- a/tests-clar/stash/foreach.c +++ b/tests-clar/stash/foreach.c @@ -30,7 +30,7 @@ void test_stash_foreach__cleanup(void) { git_signature_free(signature); git_repository_free(repo); - cl_git_pass(git_futils_rmdir_r(REPO_NAME, NULL, GIT_DIRREMOVAL_FILES_AND_DIRS)); + cl_git_pass(git_futils_rmdir_r(REPO_NAME, NULL, GIT_RMDIR_REMOVE_FILES)); } static int callback_cb( @@ -45,7 +45,7 @@ static int callback_cb( GIT_UNUSED(message); cl_assert_equal_i(0, git_oid_streq(stash_oid, data->oids[data->invokes++])); - + return 0; } diff --git a/tests-clar/stash/save.c b/tests-clar/stash/save.c index 7524cdeb6..fadb8940b 100644 --- a/tests-clar/stash/save.c +++ b/tests-clar/stash/save.c @@ -27,7 +27,7 @@ void test_stash_save__cleanup(void) { git_signature_free(signature); git_repository_free(repo); - cl_git_pass(git_futils_rmdir_r("stash", NULL, GIT_DIRREMOVAL_FILES_AND_DIRS)); + cl_git_pass(git_futils_rmdir_r("stash", NULL, GIT_RMDIR_REMOVE_FILES)); } static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type) diff --git a/tests-clar/stash/stash_helpers.c b/tests-clar/stash/stash_helpers.c index 000a0f1a9..86a741853 100644 --- a/tests-clar/stash/stash_helpers.c +++ b/tests-clar/stash/stash_helpers.c @@ -16,6 +16,7 @@ void commit_staged_files( cl_git_pass(git_index_write_tree(&tree_oid, index)); cl_git_pass(git_tree_lookup(&tree, repo, &tree_oid)); + cl_git_pass(git_commit_create_v( commit_oid, repo, |