Commit 40d791545abfb3cb71553a27dc64129e1a9bec28
2014-05-09T19:32:52
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.
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 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b01f481..1ea9618 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -145,3 +145,6 @@ v0.21 + 1
* git_treebuilder_create now takes a repository so that it can query
repository configuration. Subsequently, git_treebuilder_write no
longer takes a repository.
+
+* git_checkout now handles case-changing renames correctly on
+ case-insensitive filesystems; for example renaming "readme" to "README".
diff --git a/src/checkout.c b/src/checkout.c
index a3a4601..45e02e9 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -2474,7 +2474,7 @@ int git_checkout_tree(
if ((error = git_repository_index(&index, repo)) < 0)
return error;
- 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, index, opts);
git_iterator_free(tree_i);
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c
index 70905b8..da3c00d 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);
}