mirror of
https://git.proxmox.com/git/libgit2
synced 2025-06-21 10:34:05 +00:00
Try to fix Travis.
This commit is contained in:
parent
383fb799ee
commit
3f584b5027
@ -107,13 +107,19 @@ void test_checkout_checkout__symlinks(void)
|
|||||||
test_file_contents("./testrepo/link_to_new.txt", "new.txt");
|
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};
|
git_checkout_opts opts = {0};
|
||||||
cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!");
|
cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!");
|
||||||
opts.existing_file_action = GIT_CHECKOUT_SKIP_EXISTING;
|
opts.existing_file_action = GIT_CHECKOUT_SKIP_EXISTING;
|
||||||
cl_git_pass(git_checkout_head(g_repo, &opts, NULL));
|
cl_git_pass(git_checkout_head(g_repo, &opts, NULL));
|
||||||
test_file_contents("./testrepo/new.txt", "This isn't what's stored!");
|
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;
|
opts.existing_file_action = GIT_CHECKOUT_OVERWRITE_EXISTING;
|
||||||
cl_git_pass(git_checkout_head(g_repo, &opts, NULL));
|
cl_git_pass(git_checkout_head(g_repo, &opts, NULL));
|
||||||
test_file_contents("./testrepo/new.txt", "my new file\n");
|
test_file_contents("./testrepo/new.txt", "my new file\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user