summaryrefslogtreecommitdiff
path: root/tests-clar/checkout
diff options
context:
space:
mode:
authorBen Straub <bstraub@github.com>2012-07-26 13:12:21 -0700
committerBen Straub <bstraub@github.com>2012-07-26 13:12:21 -0700
commitb401bace1b28ac23990382605791eddbeda09d9b (patch)
treec6611b78a99a3fdcbac9084deac2ab397b6fe639 /tests-clar/checkout
parentef9905c9902a9ffad71c8acddec74dc0d8e866de (diff)
downloadlibgit2-b401bace1b28ac23990382605791eddbeda09d9b.tar.gz
Restructure for better checkout options
* Removed the #define for defaults * Promoted progress structure to top-level API call argument
Diffstat (limited to 'tests-clar/checkout')
-rw-r--r--tests-clar/checkout/checkout.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests-clar/checkout/checkout.c b/tests-clar/checkout/checkout.c
index 71f8f020..53d95c41 100644
--- a/tests-clar/checkout/checkout.c
+++ b/tests-clar/checkout/checkout.c
@@ -38,12 +38,12 @@ void test_checkout_checkout__bare(void)
{
cl_git_sandbox_cleanup();
g_repo = cl_git_sandbox_init("testrepo.git");
- cl_git_fail(git_checkout_index(g_repo, NULL));
+ cl_git_fail(git_checkout_index(g_repo, NULL, NULL));
}
void test_checkout_checkout__default(void)
{
- cl_git_pass(git_checkout_index(g_repo, NULL));
+ cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
test_file_contents("./testrepo/README", "hey there\n");
test_file_contents("./testrepo/branch_file.txt", "hi\nbye!\n");
test_file_contents("./testrepo/new.txt", "my new file\n");
@@ -57,7 +57,7 @@ void test_checkout_checkout__crlf(void)
"README text eol=cr\n"
"new.txt text eol=lf\n";
cl_git_mkfile("./testrepo/.gitattributes", attributes);
- cl_git_pass(git_checkout_index(g_repo, NULL));
+ cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
/* test_file_contents("./testrepo/README", "hey there\n"); */
/* test_file_contents("./testrepo/new.txt", "my new file\n"); */
/* test_file_contents("./testrepo/branch_file.txt", "hi\r\nbye!\r\n"); */
@@ -80,7 +80,7 @@ void test_checkout_checkout__symlinks(void)
{
/* First try with symlinks forced on */
enable_symlinks(true);
- cl_git_pass(git_checkout_index(g_repo, NULL));
+ cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
#ifdef GIT_WIN32
test_file_contents("./testrepo/link_to_new.txt", "new.txt");
@@ -101,7 +101,7 @@ void test_checkout_checkout__symlinks(void)
cl_git_sandbox_cleanup();
g_repo = cl_git_sandbox_init("testrepo");
enable_symlinks(false);
- cl_git_pass(git_checkout_index(g_repo, NULL));
+ cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
test_file_contents("./testrepo/link_to_new.txt", "new.txt");
}