diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-02-27 19:02:37 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-02-27 21:50:48 +0300 |
| commit | 496b76d415b080712d7648fc6f1ff2e55d27a6a5 (patch) | |
| tree | 7e99e25d9dbeb31bdbb9b67142007dd7059985a7 /tests/checkout/typechange.c | |
| parent | 96b82b11c64ffcf00e0d10b1bad1b6d1fbfc896c (diff) | |
checkout tests: just use SAFE where appropriate
Diffstat (limited to 'tests/checkout/typechange.c')
| -rw-r--r-- | tests/checkout/typechange.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/checkout/typechange.c b/tests/checkout/typechange.c index 4a0b38ae0..c32330950 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)); |