diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-02-14 19:44:05 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-02-27 21:50:44 +0300 |
| commit | 96b82b11c64ffcf00e0d10b1bad1b6d1fbfc896c (patch) | |
| tree | bcca5b2ad67134d451cc3e1d9fe2980cb58b68c6 /tests/checkout/typechange.c | |
| parent | 14fec0aea3b57bdf29ab7a195061127f8a3edc30 (diff) | |
checkout: remove `GIT_CHECKOUT_SAFE_CREATE` as a strategy
Diffstat (limited to 'tests/checkout/typechange.c')
| -rw-r--r-- | tests/checkout/typechange.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/checkout/typechange.c b/tests/checkout/typechange.c index 7aa14b36d..4a0b38ae0 100644 --- a/tests/checkout/typechange.c +++ b/tests/checkout/typechange.c @@ -212,7 +212,8 @@ 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_CREATE; + opts.checkout_strategy = GIT_CHECKOUT_SAFE | + GIT_CHECKOUT_RECREATE_MISSING; memset(&cts, 0, sizeof(cts)); cl_git_fail(git_checkout_tree(g_repo, obj, &opts)); |