summaryrefslogtreecommitdiff
path: root/tests/checkout/tree.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-05-09 19:32:52 -0700
committerEdward Thomson <ethomson@microsoft.com>2014-12-23 10:14:04 -0600
commit40d791545abfb3cb71553a27dc64129e1a9bec28 (patch)
treee207f4ed10a85cf03e3fdf3afc6c7c724b886d61 /tests/checkout/tree.c
parent61ee5b0e577383bd0ae99080a879add0be2d1f59 (diff)
downloadlibgit2-40d791545abfb3cb71553a27dc64129e1a9bec28.tar.gz
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.
Diffstat (limited to 'tests/checkout/tree.c')
-rw-r--r--tests/checkout/tree.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c
index 70905b843..da3c00d3c 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);
}