summaryrefslogtreecommitdiff
path: root/tests-clar/checkout
diff options
context:
space:
mode:
Diffstat (limited to 'tests-clar/checkout')
-rw-r--r--tests-clar/checkout/checkout_util.h5
-rw-r--r--tests-clar/checkout/index.c5
-rw-r--r--tests-clar/checkout/tree.c3
3 files changed, 3 insertions, 10 deletions
diff --git a/tests-clar/checkout/checkout_util.h b/tests-clar/checkout/checkout_util.h
deleted file mode 100644
index d6aa7ed47..000000000
--- a/tests-clar/checkout/checkout_util.h
+++ /dev/null
@@ -1,5 +0,0 @@
-GIT_INLINE(void) reset_checkout_opts(git_checkout_opts *opts)
-{
- git_checkout_opts init_opts = GIT_CHECKOUT_OPTS_INIT;
- memmove(opts, &init_opts, sizeof(git_checkout_opts));
-}
diff --git a/tests-clar/checkout/index.c b/tests-clar/checkout/index.c
index e86dfe954..a67765b26 100644
--- a/tests-clar/checkout/index.c
+++ b/tests-clar/checkout/index.c
@@ -2,7 +2,6 @@
#include "git2/checkout.h"
#include "repository.h"
-#include "checkout_util.h"
static git_repository *g_repo;
static git_checkout_opts g_opts;
@@ -26,7 +25,7 @@ void test_checkout_index__initialize(void)
{
git_tree *tree;
- reset_checkout_opts(&g_opts);
+ GIT_INIT_STRUCTURE(&g_opts, GIT_CHECKOUT_OPTS_VERSION);
g_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
g_repo = cl_git_sandbox_init("testrepo");
@@ -67,7 +66,7 @@ void test_checkout_index__cannot_checkout_a_bare_repository(void)
{
test_checkout_index__cleanup();
- reset_checkout_opts(&g_opts);
+ GIT_INIT_STRUCTURE(&g_opts, GIT_CHECKOUT_OPTS_VERSION);
g_repo = cl_git_sandbox_init("testrepo.git");
cl_git_fail(git_checkout_index(g_repo, NULL, NULL));
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c
index fe5bd4ff8..88dbe4ffc 100644
--- a/tests-clar/checkout/tree.c
+++ b/tests-clar/checkout/tree.c
@@ -2,7 +2,6 @@
#include "git2/checkout.h"
#include "repository.h"
-#include "checkout_util.h"
static git_repository *g_repo;
static git_checkout_opts g_opts;
@@ -12,7 +11,7 @@ void test_checkout_tree__initialize(void)
{
g_repo = cl_git_sandbox_init("testrepo");
- reset_checkout_opts(&g_opts);
+ GIT_INIT_STRUCTURE(&g_opts, GIT_CHECKOUT_OPTS_VERSION);
g_opts.checkout_strategy = GIT_CHECKOUT_SAFE;
}