Commit 18eff2ad7027cb82ccf61b4ae7c4fa8d75c6eace
2012-11-08T16:44:39
Clean up a couple things missed in rebase
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c
index 5bbc745..39139cc 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 818d906..d7127a9 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 01acf67..b4b7b5a 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)