Clean up a couple things missed in rebase

diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c
index 5bbc7452a144dea6bd19a2fb6e80c031bb824edf..39139ccae909b9659257ffd2b904fa1fee9c8997 100644 (file)
--- 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 818d906e775e017cc44be368a95ffc935d4c7817..d7127a9db5352ee37e084c7278ce86ddafba8aff 100644 (file)
--- 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 01acf672cbc561603d01c90eb9630a5e918b0d90..b4b7b5a4a96c0eeb6e1b1d09c92ba4b913b670ea 100644 (file)
--- 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)