proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-06 23:29:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix broken merge tests due to autocrlf was not false

Browse Source
This commit is contained in:
Linquize 2014-12-07 23:41:30 +08:00
parent d226fbf1aa
commit 8e0aa2ebce
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/merge/workdir/simple.c
View File

@ -237,6 +237,8 @@ void test_merge_workdir_simple__mergefile(void)
REMOVED_IN_MASTER_REUC_ENTRY REMOVED_IN_MASTER_REUC_ENTRY
}; };
set_core_autocrlf_to(repo, false);
merge_simple_branch(0, 0); merge_simple_branch(0, 0);
cl_git_pass(git_futils_readbuffer(&conflicting_buf, cl_git_pass(git_futils_readbuffer(&conflicting_buf,
@ -279,6 +281,8 @@ void test_merge_workdir_simple__diff3(void)
REMOVED_IN_MASTER_REUC_ENTRY REMOVED_IN_MASTER_REUC_ENTRY
}; };
set_core_autocrlf_to(repo, false);
merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_DIFF3); merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_DIFF3);
cl_git_pass(git_futils_readbuffer(&conflicting_buf, 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_repository_config(&config, repo));
cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3")); cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3"));
set_core_autocrlf_to(repo, false);
merge_simple_branch(0, 0); merge_simple_branch(0, 0);
cl_git_pass(git_futils_readbuffer(&conflicting_buf, 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_repository_config(&config, repo));
cl_git_pass(git_config_set_string(config, "merge.conflictstyle", "diff3")); 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); merge_simple_branch(0, GIT_CHECKOUT_CONFLICT_STYLE_MERGE);
cl_git_pass(git_futils_readbuffer(&conflicting_buf, cl_git_pass(git_futils_readbuffer(&conflicting_buf,

12
tests/rebase/merge.c
View File

@ -8,12 +8,24 @@
static git_repository *repo; static git_repository *repo;
static git_signature *signature; 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 // Fixture setup and teardown
void test_rebase_merge__initialize(void) void test_rebase_merge__initialize(void)
{ {
repo = cl_git_sandbox_init("rebase"); repo = cl_git_sandbox_init("rebase");
cl_git_pass(git_signature_new(&signature, cl_git_pass(git_signature_new(&signature,
"Rebaser", "rebaser@rebaser.rb", 1405694510, 0)); "Rebaser", "rebaser@rebaser.rb", 1405694510, 0));
set_core_autocrlf_to(repo, false);
} }
void test_rebase_merge__cleanup(void) void test_rebase_merge__cleanup(void)