diff options
| author | Ben Straub <bs@github.com> | 2014-01-03 17:38:34 -0800 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-03-06 09:44:51 -0800 |
| commit | 6affd71f33f9a9693425d6f3599ba1f25226c34b (patch) | |
| tree | 42127170b47c96ec55438920e812dc0d96568add /tests/merge | |
| parent | 8e5247203720de7abd084996c00afd6fb6f6cc21 (diff) | |
| download | libgit2-6affd71f33f9a9693425d6f3599ba1f25226c34b.tar.gz | |
git_checkout_opts -> git_checkout_options
Diffstat (limited to 'tests/merge')
| -rw-r--r-- | tests/merge/merge_helpers.c | 2 | ||||
| -rw-r--r-- | tests/merge/workdir/trivial.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index 8d6ef2dbe..14a30b288 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -83,7 +83,7 @@ int merge_branches(git_merge_result **result, git_repository *repo, const char * { git_reference *head_ref, *theirs_ref; git_merge_head *theirs_head; - git_checkout_opts head_checkout_opts = GIT_CHECKOUT_OPTS_INIT; + git_checkout_options head_checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; head_checkout_opts.checkout_strategy = GIT_CHECKOUT_FORCE; diff --git a/tests/merge/workdir/trivial.c b/tests/merge/workdir/trivial.c index a6bbbf095..8b0d32894 100644 --- a/tests/merge/workdir/trivial.c +++ b/tests/merge/workdir/trivial.c @@ -31,7 +31,7 @@ void test_merge_workdir_trivial__cleanup(void) static int merge_trivial(const char *ours, const char *theirs) { git_buf branch_buf = GIT_BUF_INIT; - git_checkout_opts checkout_opts = GIT_CHECKOUT_OPTS_INIT; + git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT; git_reference *our_ref, *their_ref; git_merge_head *their_heads[1]; git_merge_opts opts = GIT_MERGE_OPTS_INIT; |