Commit c5df10f4aa0debf113da3430849876a3a28a25ea
2012-11-30T10:59:03
Failing test on git_checkout_tree when removing directories
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
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c
index 90f215f..79cfb6f 100644
--- a/tests-clar/checkout/tree.c
+++ b/tests-clar/checkout/tree.c
@@ -48,6 +48,33 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_commit(void)
cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/fgh/1.txt"));
}
+void test_checkout_tree__can_checkout_and_remove_directory(void)
+{
+ git_reference *head;
+ cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/"));
+
+ // Checkout brach "subtrees" and update HEAD, so that HEAD matches the current working tree
+ cl_git_pass(git_revparse_single(&g_object, g_repo, "subtrees"));
+ cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
+ cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
+ cl_git_pass(git_reference_symbolic_set_target(head, "refs/heads/subtrees"));
+ git_reference_free(head);
+
+ cl_assert_equal_i(true, git_path_isdir("./testrepo/ab/"));
+ cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/2.txt"));
+ cl_assert_equal_i(true, git_path_isfile("./testrepo/ab/de/fgh/1.txt"));
+
+ // Checkout brach "master" and update HEAD, so that HEAD matches the current working tree
+ cl_git_pass(git_revparse_single(&g_object, g_repo, "master"));
+ cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
+ cl_git_pass(git_reference_lookup(&head, g_repo, "HEAD"));
+ cl_git_pass(git_reference_symbolic_set_target(head, "refs/heads/master"));
+ git_reference_free(head);
+
+ // This directory should no longer exist
+ cl_assert_equal_i(false, git_path_isdir("./testrepo/ab/"));
+}
+
void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void)
{
char *entries[] = { "de/" };