diff options
author | Edward Thomson <ethomson@microsoft.com> | 2014-05-09 19:32:52 -0700 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-01-16 18:56:05 -0500 |
commit | d853fb9f24e0fe63b3dce9fbc04fd9cfe17a030b (patch) | |
tree | 2db2606efca9b583f684234469a9729e82fe7dde | |
parent | 84330788e44b2c9673ee51b3647b057de170be91 (diff) | |
download | libgit2-d853fb9f24e0fe63b3dce9fbc04fd9cfe17a030b.tar.gz |
Always checkout with case sensitive iteratorv0.21.5maint/v0.21
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.
-rw-r--r-- | src/checkout.c | 2 | ||||
-rw-r--r-- | tests/checkout/tree.c | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/checkout.c b/src/checkout.c index d445ac4cc..18f837e2e 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -2364,7 +2364,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 9ed208c24..38e898dd2 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); } |