Merge pull request #2751 from linquize/broken-test-win

Fix broken tests on Windows

tests/merge/workdir/simple.c

@@ -237,6 +237,8 @@ void test_merge_workdir_simple__mergefile(void)
 		REMOVED_IN_MASTER_REUC_ENTRY
 	};
 
+	set_core_autocrlf_to(repo, false);
+
 	merge_simple_branch(0, 0);
 
 	cl_git_pass(git_futils_readbuffer(&conflicting_buf,
@@ -279,6 +281,8 @@ void test_merge_workdir_simple__diff3(void)
 		REMOVED_IN_MASTER_REUC_ENTRY
 	};
 
+	set_core_autocrlf_to(repo, false);
+
 	merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_DIFF3);
 
 	cl_git_pass(git_futils_readbuffer(&conflicting_buf,
@@ -352,6 +356,8 @@ void test_merge_workdir_simple__diff3_from_config(void)
 	cl_git_pass(git_repository_config(&config, repo));
 	cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3"));
 
+	set_core_autocrlf_to(repo, false);
+
 	merge_simple_branch(0, 0);
 
 	cl_git_pass(git_futils_readbuffer(&conflicting_buf,
@@ -392,6 +398,8 @@ void test_merge_workdir_simple__merge_overrides_config(void)
 	cl_git_pass(git_repository_config(&config, repo));
 	cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3"));
 
+	set_core_autocrlf_to(repo, false);
+
 	merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_MERGE);
 
 	cl_git_pass(git_futils_readbuffer(&conflicting_buf,

tests/network/remote/local.c

@@ -494,9 +494,8 @@ void test_network_remote_local__push_delete(void)
 	cl_git_pass(git_remote_push(remote, &specs, NULL, NULL, NULL));
 	cl_git_fail(git_reference_lookup(&ref, dst_repo, "refs/heads/master"));
 
-	cl_fixture_cleanup("target.git");
-
 	git_remote_free(remote);
 	git_repository_free(dst_repo);
-	git_repository_free(src_repo);
+	cl_fixture_cleanup("target.git");
+	cl_git_sandbox_cleanup();
 }

tests/rebase/merge.c

@@ -8,12 +8,24 @@
 static git_repository *repo;
 static git_signature *signature;
 
+static void set_core_autocrlf_to(git_repository *repo, bool value)
+{
+	git_config *cfg;
+
+	cl_git_pass(git_repository_config(&cfg, repo));
+	cl_git_pass(git_config_set_bool(cfg, "core.autocrlf", value));
+
+	git_config_free(cfg);
+}
+
 // Fixture setup and teardown
 void test_rebase_merge__initialize(void)
 {
 	repo = cl_git_sandbox_init("rebase");
 	cl_git_pass(git_signature_new(&signature,
 		"Rebaser", "rebaser@rebaser.rb", 1405694510, 0));
+
+	set_core_autocrlf_to(repo, false);
 }
 
 void test_rebase_merge__cleanup(void)