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.
diff --git a/src/checkout.c b/src/checkout.c
index a170b26..36241c6 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -2458,7 +2458,7 @@
}
}
- 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 128acf9..d1c64c3 100644
--- a/tests/checkout/tree.c
+++ b/tests/checkout/tree.c
@@ -645,14 +645,7 @@
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 @@
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);
}
