Commit 8427757f by Russell Belfer

Fixing up some win32 issues with autocrlf

parent e399c7ee
...@@ -7,6 +7,8 @@ static git_repository *g_repo = NULL; ...@@ -7,6 +7,8 @@ static git_repository *g_repo = NULL;
void test_diff_rename__initialize(void) void test_diff_rename__initialize(void)
{ {
g_repo = cl_git_sandbox_init("renames"); g_repo = cl_git_sandbox_init("renames");
cl_repo_set_bool(g_repo, "core.autocrlf", false);
} }
void test_diff_rename__cleanup(void) void test_diff_rename__cleanup(void)
......
...@@ -5,16 +5,12 @@ static git_repository *g_repo = NULL; ...@@ -5,16 +5,12 @@ static git_repository *g_repo = NULL;
void test_filter_crlf__initialize(void) void test_filter_crlf__initialize(void)
{ {
git_config *cfg;
g_repo = cl_git_sandbox_init("crlf"); g_repo = cl_git_sandbox_init("crlf");
cl_git_mkfile("crlf/.gitattributes", cl_git_mkfile("crlf/.gitattributes",
"*.txt text\n*.bin binary\n*.crlf text eol=crlf\n*.lf text eol=lf\n"); "*.txt text\n*.bin binary\n*.crlf text eol=crlf\n*.lf text eol=lf\n");
cl_git_pass(git_repository_config(&cfg, g_repo)); cl_repo_set_bool(g_repo, "core.autocrlf", true);
cl_git_pass(git_config_set_string(cfg, "core.autocrlf", "true"));
git_config_free(cfg);
} }
void test_filter_crlf__cleanup(void) void test_filter_crlf__cleanup(void)
......
...@@ -11,6 +11,8 @@ static git_repository *g_repo = NULL; ...@@ -11,6 +11,8 @@ static git_repository *g_repo = NULL;
void test_status_renames__initialize(void) void test_status_renames__initialize(void)
{ {
g_repo = cl_git_sandbox_init("renames"); g_repo = cl_git_sandbox_init("renames");
cl_repo_set_bool(g_repo, "core.autocrlf", false);
} }
void test_status_renames__cleanup(void) void test_status_renames__cleanup(void)
...@@ -67,7 +69,7 @@ static void test_status( ...@@ -67,7 +69,7 @@ static void test_status(
actual = git_status_byindex(status_list, i); actual = git_status_byindex(status_list, i);
expected = &expected_list[i]; expected = &expected_list[i];
cl_assert_equal_i((int)expected->status, (int)actual->status); cl_assert_equal_i_fmt(expected->status, actual->status, "%04x");
oldname = actual->head_to_index ? actual->head_to_index->old_file.path : oldname = actual->head_to_index ? actual->head_to_index->old_file.path :
actual->index_to_workdir ? actual->index_to_workdir->old_file.path : NULL; actual->index_to_workdir ? actual->index_to_workdir->old_file.path : NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment