From 4a30c53146e7d1068af6f02dba3ef925878d11b8 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Fri, 9 May 2014 19:32:52 -0700 Subject: Always checkout with case sensitive iterator On a case-insensitive filesystem, we need to deal with case-changing renames (eg, foo -> FOO) by removing the old and adding the new, exactly as if we were on a case-sensitive filesystem. Update the `checkout::tree::can_cancel_checkout_from_notify` test, now that notifications are always sent case sensitively. --- src/checkout.c | 2 +- tests/checkout/tree.c | 15 ++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/src/checkout.c b/src/checkout.c index a170b26ea..36241c643 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2458,7 +2458,7 @@ int git_checkout_tree( } } - if (!(error = git_iterator_for_tree(&tree_i, tree, 0, NULL, NULL))) + if (!(error = git_iterator_for_tree(&tree_i, tree, GIT_ITERATOR_DONT_IGNORE_CASE, NULL, NULL))) error = git_checkout_iterator(tree_i, opts); git_iterator_free(tree_i); diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c index 128acf9b0..d1c64c3ff 100644 --- a/tests/checkout/tree.c +++ b/tests/checkout/tree.c @@ -645,14 +645,7 @@ void test_checkout_tree__can_cancel_checkout_from_notify(void) cl_git_fail_with(git_checkout_tree(g_repo, obj, &opts), -5555); cl_assert(!git_path_exists("testrepo/new.txt")); - - /* on case-insensitive FS = a/b.txt, branch_file.txt, new.txt */ - /* on case-sensitive FS = README, then above */ - - if (git_path_exists("testrepo/.git/CoNfIg")) /* case insensitive */ - cl_assert_equal_i(3, ca.count); - else - cl_assert_equal_i(4, ca.count); + cl_assert_equal_i(4, ca.count); /* and again with a different stopping point and return code */ ca.filename = "README"; @@ -662,11 +655,7 @@ void test_checkout_tree__can_cancel_checkout_from_notify(void) cl_git_fail_with(git_checkout_tree(g_repo, obj, &opts), 123); cl_assert(!git_path_exists("testrepo/new.txt")); - - if (git_path_exists("testrepo/.git/CoNfIg")) /* case insensitive */ - cl_assert_equal_i(4, ca.count); - else - cl_assert_equal_i(1, ca.count); + cl_assert_equal_i(1, ca.count); git_object_free(obj); } -- cgit v1.2.1