diff options
author | Ben Straub <bstraub@github.com> | 2012-07-31 09:01:11 -0700 |
---|---|---|
committer | Ben Straub <bstraub@github.com> | 2012-07-31 09:01:11 -0700 |
commit | 3f584b5027a6875f4502ab4839e93f80afac95dd (patch) | |
tree | 2d61877ac840128c410cc2956d23c535227aa4f7 | |
parent | 383fb799ee66b2b50ba80ad1c3cc858cbfd783b7 (diff) | |
download | libgit2-3f584b5027a6875f4502ab4839e93f80afac95dd.tar.gz |
Try to fix Travis.
-rw-r--r-- | tests-clar/checkout/checkout.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests-clar/checkout/checkout.c b/tests-clar/checkout/checkout.c index 8e8e94a7b..1e777e045 100644 --- a/tests-clar/checkout/checkout.c +++ b/tests-clar/checkout/checkout.c @@ -107,13 +107,19 @@ void test_checkout_checkout__symlinks(void) test_file_contents("./testrepo/link_to_new.txt", "new.txt"); } -void test_checkout_checkout__existing_file_options(void) +void test_checkout_checkout__existing_file_skip(void) { git_checkout_opts opts = {0}; cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!"); opts.existing_file_action = GIT_CHECKOUT_SKIP_EXISTING; cl_git_pass(git_checkout_head(g_repo, &opts, NULL)); test_file_contents("./testrepo/new.txt", "This isn't what's stored!"); +} + +void test_checkout_checkout__existing_file_overwrite(void) +{ + git_checkout_opts opts = {0}; + cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!"); opts.existing_file_action = GIT_CHECKOUT_OVERWRITE_EXISTING; cl_git_pass(git_checkout_head(g_repo, &opts, NULL)); test_file_contents("./testrepo/new.txt", "my new file\n"); |