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 /tests/merge/workdir | |
| parent | d226fbf1aa1943c49b863736592be3c9b82cbee3 (diff) | |
| download | libgit2-8e0aa2ebcee4387401ddede323fc4f8751a1ccfd.tar.gz | |
Fix broken merge tests due to autocrlf was not false
Diffstat (limited to 'tests/merge/workdir')
| -rw-r--r-- | tests/merge/workdir/simple.c | 8 |
1 files changed, 8 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, |