Commit b2be351aaddc6ba0b3a0f2cf4e09536a3b27e598
2012-08-21T10:10:32
Win32: test core.autocrlf
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
diff --git a/tests-clar/checkout/checkout.c b/tests-clar/checkout/checkout.c
index 35894d4..d6b79b4 100644
--- a/tests-clar/checkout/checkout.c
+++ b/tests-clar/checkout/checkout.c
@@ -59,19 +59,35 @@ void test_checkout_checkout__crlf(void)
const char *attributes =
"branch_file.txt text eol=crlf\n"
"new.txt text eol=lf\n";
- const char *expected_readme_text =
-#ifdef GIT_WIN32
- "hey there\r\n";
-#else
- "hey there\n";
-#endif
+ git_config *cfg;
+
+ cl_git_pass(git_repository_config__weakptr(&cfg, g_repo));
+ cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", false));
cl_git_mkfile("./testrepo/.gitattributes", attributes);
+
cl_git_pass(git_checkout_head(g_repo, NULL, NULL));
- test_file_contents("./testrepo/README", expected_readme_text);
+ test_file_contents("./testrepo/README", "hey there\n");
test_file_contents("./testrepo/new.txt", "my new file\n");
test_file_contents("./testrepo/branch_file.txt", "hi\r\nbye!\r\n");
}
+
+void test_checkout_checkout__win32_autocrlf(void)
+{
+#ifdef GIT_WIN32
+ git_config *cfg;
+ const char *expected_readme_text = "hey there\r\n";
+
+ cl_must_pass(p_unlink("./testrepo/.gitattributes"));
+ cl_git_pass(git_repository_config__weakptr(&cfg, g_repo));
+ cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", true));
+
+ cl_git_pass(git_checkout_head(g_repo, NULL, NULL));
+ test_file_contents("./testrepo/README", expected_readme_text);
+#endif
+}
+
+
static void enable_symlinks(bool enable)
{
git_config *cfg;