diff options
| author | Linquize <linquize@yahoo.com.hk> | 2014-12-07 23:41:30 +0800 |
|---|---|---|
| committer | Linquize <linquize@yahoo.com.hk> | 2014-12-07 23:41:30 +0800 |
| commit | 8e0aa2ebcee4387401ddede323fc4f8751a1ccfd (patch) | |
| tree | 1c0dc89b5c3c27de91e5ffdf8f3c3ce4098fef6e | |
| parent | d226fbf1aa1943c49b863736592be3c9b82cbee3 (diff) | |
| download | libgit2-8e0aa2ebcee4387401ddede323fc4f8751a1ccfd.tar.gz | |
Fix broken merge tests due to autocrlf was not false
| -rw-r--r-- | tests/merge/workdir/simple.c | 8 | ||||
| -rw-r--r-- | tests/rebase/merge.c | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index df531f48f..4019e0077 100644 --- a/tests/merge/workdir/simple.c +++ b/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, diff --git a/tests/rebase/merge.c b/tests/rebase/merge.c index 06177717c..1b2ec96bc 100644 --- a/tests/rebase/merge.c +++ b/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) |