Commit 496b76d415b080712d7648fc6f1ff2e55d27a6a5
2015-02-27T11:02:37
checkout tests: just use SAFE where appropriate
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c
index 8003887..7ba9c25 100644
--- a/tests/checkout/tree.c
+++ b/tests/checkout/tree.c
@@ -15,8 +15,7 @@ void test_checkout_tree__initialize(void)
g_repo = cl_git_sandbox_init("testrepo");
GIT_INIT_STRUCTURE(&g_opts, GIT_CHECKOUT_OPTIONS_VERSION);
- g_opts.checkout_strategy = GIT_CHECKOUT_SAFE |
- GIT_CHECKOUT_RECREATE_MISSING;
+ g_opts.checkout_strategy = GIT_CHECKOUT_FORCE;
}
void test_checkout_tree__cleanup(void)
@@ -409,8 +408,7 @@ void test_checkout_tree__can_checkout_with_pattern(void)
/* now to a narrow patterned checkout */
- g_opts.checkout_strategy = GIT_CHECKOUT_SAFE |
- GIT_CHECKOUT_RECREATE_MISSING;
+ g_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
g_opts.paths.strings = entries;
g_opts.paths.count = 1;
@@ -448,7 +446,6 @@ void test_checkout_tree__can_disable_pattern_match(void)
g_opts.checkout_strategy =
GIT_CHECKOUT_SAFE |
- GIT_CHECKOUT_RECREATE_MISSING |
GIT_CHECKOUT_DISABLE_PATHSPEC_MATCH;
g_opts.paths.strings = entries;
g_opts.paths.count = 1;
@@ -461,8 +458,7 @@ void test_checkout_tree__can_disable_pattern_match(void)
/* let's try that again, but allow the pattern match */
- g_opts.checkout_strategy = GIT_CHECKOUT_SAFE |
- GIT_CHECKOUT_RECREATE_MISSING;
+ g_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
diff --git a/tests/checkout/typechange.c b/tests/checkout/typechange.c
index 4a0b38a..c323309 100644
--- a/tests/checkout/typechange.c
+++ b/tests/checkout/typechange.c
@@ -212,8 +212,7 @@ void test_checkout_typechange__checkout_with_conflicts(void)
p_mkdir("typechanges/d", 0777); /* intentionally empty dir */
force_create_file("typechanges/untracked");
- opts.checkout_strategy = GIT_CHECKOUT_SAFE |
- GIT_CHECKOUT_RECREATE_MISSING;
+ opts.checkout_strategy = GIT_CHECKOUT_SAFE;
memset(&cts, 0, sizeof(cts));
cl_git_fail(git_checkout_tree(g_repo, obj, &opts));