From 18eff2ad7027cb82ccf61b4ae7c4fa8d75c6eace Mon Sep 17 00:00:00 2001 From: Russell Belfer Date: Thu, 8 Nov 2012 16:44:39 -0800 Subject: [PATCH] Clean up a couple things missed in rebase --- tests-clar/stash/drop.c | 2 +- tests-clar/stash/foreach.c | 4 ++-- tests-clar/stash/save.c | 2 +- 3 files changed, 4 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 01acf672c..b4b7b5a4a 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)