diff options
| author | Ben Straub <bs@github.com> | 2014-02-05 13:35:26 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-02-05 13:35:26 -0800 |
| commit | a2ce19ca68e060838ec08d7f3e0c35160a2b6697 (patch) | |
| tree | e9afa1c78efcea75f04d4d195d8875520b1b6bd2 | |
| parent | 5c8be3255905f77d60a239381d9ce39a6934a038 (diff) | |
| download | libgit2-a2ce19ca68e060838ec08d7f3e0c35160a2b6697.tar.gz | |
Prevent user's merge.conflictstyle from breaking tests
| -rw-r--r-- | tests/checkout/conflict.c | 7 | ||||
| -rw-r--r-- | tests/merge/workdir/renames.c | 7 | ||||
| -rw-r--r-- | tests/merge/workdir/simple.c | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index a8b93b28d..2fea511da 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -61,12 +61,19 @@ struct checkout_name_entry { void test_checkout_conflict__initialize(void) { + git_config *cfg; + g_repo = cl_git_sandbox_init(TEST_REPO_PATH); git_repository_index(&g_index, g_repo); cl_git_rewritefile( TEST_REPO_PATH "/.gitattributes", "* text eol=lf\n"); + + /* Ensure that the user's merge.conflictstyle doesn't interfere */ + cl_git_pass(git_repository_config(&cfg, g_repo)); + cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); + git_config_free(cfg); } void test_checkout_conflict__cleanup(void) diff --git a/tests/merge/workdir/renames.c b/tests/merge/workdir/renames.c index d38397983..27747720e 100644 --- a/tests/merge/workdir/renames.c +++ b/tests/merge/workdir/renames.c @@ -17,7 +17,14 @@ static git_repository *repo; // Fixture setup and teardown void test_merge_workdir_renames__initialize(void) { + git_config *cfg; + repo = cl_git_sandbox_init(TEST_REPO_PATH); + + /* Ensure that the user's merge.conflictstyle doesn't interfere */ + cl_git_pass(git_repository_config(&cfg, repo)); + cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); + git_config_free(cfg); } void test_merge_workdir_renames__cleanup(void) diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index 1f128879b..a9a63651c 100644 --- a/tests/merge/workdir/simple.c +++ b/tests/merge/workdir/simple.c @@ -116,8 +116,15 @@ static git_index *repo_index; // Fixture setup and teardown void test_merge_workdir_simple__initialize(void) { + git_config *cfg; + repo = cl_git_sandbox_init(TEST_REPO_PATH); git_repository_index(&repo_index, repo); + + /* Ensure that the user's merge.conflictstyle doesn't interfere */ + cl_git_pass(git_repository_config(&cfg, repo)); + cl_git_pass(git_config_set_string(cfg, "merge.conflictstyle", "merge")); + git_config_free(cfg); } void test_merge_workdir_simple__cleanup(void) |