summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/merge/merge_helpers.c6
-rw-r--r--tests/merge/merge_helpers.h6
-rw-r--r--tests/merge/trees/automerge.c8
-rw-r--r--tests/merge/trees/commits.c6
-rw-r--r--tests/merge/trees/renames.c4
-rw-r--r--tests/merge/trees/treediff.c2
-rw-r--r--tests/merge/trees/trivial.c2
-rw-r--r--tests/merge/workdir/dirty.c2
-rw-r--r--tests/merge/workdir/renames.c6
-rw-r--r--tests/merge/workdir/simple.c8
-rw-r--r--tests/revert/workdir.c8
-rw-r--r--tests/structinit/structinit.c4
12 files changed, 31 insertions, 31 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c
index e3c2b9e4a..53a0e7b4d 100644
--- a/tests/merge/merge_helpers.c
+++ b/tests/merge/merge_helpers.c
@@ -10,7 +10,7 @@
int merge_trees_from_branches(
git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name,
- git_merge_tree_opts *opts)
+ git_merge_options *opts)
{
git_commit *our_commit, *their_commit, *ancestor_commit = NULL;
git_tree *our_tree, *their_tree, *ancestor_tree = NULL;
@@ -55,7 +55,7 @@ int merge_trees_from_branches(
int merge_commits_from_branches(
git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name,
- git_merge_tree_opts *opts)
+ git_merge_options *opts)
{
git_commit *our_commit, *their_commit;
git_oid our_oid, their_oid;
@@ -81,7 +81,7 @@ int merge_commits_from_branches(
int merge_branches(git_merge_result **result, git_repository *repo,
const char *ours_branch, const char *theirs_branch,
- git_merge_tree_opts *merge_opts, git_checkout_options *checkout_opts)
+ git_merge_options *merge_opts, git_checkout_options *checkout_opts)
{
git_reference *head_ref, *theirs_ref;
git_merge_head *theirs_head;
diff --git a/tests/merge/merge_helpers.h b/tests/merge/merge_helpers.h
index e5dc34b06..71f84467d 100644
--- a/tests/merge/merge_helpers.h
+++ b/tests/merge/merge_helpers.h
@@ -85,16 +85,16 @@ struct merge_index_conflict_data {
int merge_trees_from_branches(
git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name,
- git_merge_tree_opts *opts);
+ git_merge_options *opts);
int merge_commits_from_branches(
git_index **index, git_repository *repo,
const char *ours_name, const char *theirs_name,
- git_merge_tree_opts *opts);
+ git_merge_options *opts);
int merge_branches(git_merge_result **result, git_repository *repo,
const char *ours_branch, const char *theirs_branch,
- git_merge_tree_opts *merge_opts, git_checkout_options *checkout_opts);
+ git_merge_options *merge_opts, git_checkout_options *checkout_opts);
int merge_test_diff_list(git_merge_diff_list *diff_list, const struct merge_index_entry expected[], size_t expected_len);
diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c
index 79069d81d..c18881d7c 100644
--- a/tests/merge/trees/automerge.c
+++ b/tests/merge/trees/automerge.c
@@ -69,7 +69,7 @@ void test_merge_trees_automerge__automerge(void)
{
git_index *index;
const git_index_entry *entry;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
git_blob *blob;
struct merge_index_entry merge_index_entries[] = {
@@ -109,7 +109,7 @@ void test_merge_trees_automerge__automerge(void)
void test_merge_trees_automerge__favor_ours(void)
{
git_index *index;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
ADDED_IN_MASTER_INDEX_ENTRY,
@@ -140,7 +140,7 @@ void test_merge_trees_automerge__favor_ours(void)
void test_merge_trees_automerge__favor_theirs(void)
{
git_index *index;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
ADDED_IN_MASTER_INDEX_ENTRY,
@@ -171,7 +171,7 @@ void test_merge_trees_automerge__favor_theirs(void)
void test_merge_trees_automerge__unrelated(void)
{
git_index *index;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
diff --git a/tests/merge/trees/commits.c b/tests/merge/trees/commits.c
index 08caf804f..c4e470997 100644
--- a/tests/merge/trees/commits.c
+++ b/tests/merge/trees/commits.c
@@ -22,7 +22,7 @@ void test_merge_trees_commits__automerge(void)
{
git_index *index;
const git_index_entry *entry;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
git_blob *blob;
struct merge_index_entry merge_index_entries[] = {
@@ -71,7 +71,7 @@ void test_merge_trees_commits__automerge(void)
void test_merge_trees_commits__no_ancestor(void)
{
git_index *index;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
@@ -98,7 +98,7 @@ void test_merge_trees_commits__no_ancestor(void)
void test_merge_trees_commits__df_conflict(void)
{
git_index *index;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 2, "dir-10" },
diff --git a/tests/merge/trees/renames.c b/tests/merge/trees/renames.c
index 427b6bd8f..d7721c894 100644
--- a/tests/merge/trees/renames.c
+++ b/tests/merge/trees/renames.c
@@ -27,7 +27,7 @@ void test_merge_trees_renames__cleanup(void)
void test_merge_trees_renames__index(void)
{
git_index *index;
- git_merge_tree_opts *opts = NULL;
+ git_merge_options *opts = NULL;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
@@ -205,7 +205,7 @@ void test_merge_trees_renames__index(void)
void test_merge_trees_renames__no_rename_index(void)
{
git_index *index;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
diff --git a/tests/merge/trees/treediff.c b/tests/merge/trees/treediff.c
index 357859df3..2298a302b 100644
--- a/tests/merge/trees/treediff.c
+++ b/tests/merge/trees/treediff.c
@@ -44,7 +44,7 @@ static void test_find_differences(
git_oid ancestor_oid, ours_oid, theirs_oid;
git_tree *ancestor_tree, *ours_tree, *theirs_tree;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
opts.target_limit = 1000;
opts.rename_threshold = 50;
diff --git a/tests/merge/trees/trivial.c b/tests/merge/trees/trivial.c
index 377b24742..62a4574b8 100644
--- a/tests/merge/trees/trivial.c
+++ b/tests/merge/trees/trivial.c
@@ -31,7 +31,7 @@ static int merge_trivial(git_index **index, const char *ours, const char *theirs
git_tree *our_tree, *their_tree, *ancestor_tree;
git_oid our_oid, their_oid, ancestor_oid;
git_buf branch_buf = GIT_BUF_INIT;
- git_merge_tree_opts opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours);
cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr));
diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c
index 61b83a648..99d0d5433 100644
--- a/tests/merge/workdir/dirty.c
+++ b/tests/merge/workdir/dirty.c
@@ -90,7 +90,7 @@ static int merge_branch(git_merge_result **result, int merge_file_favor, int che
{
git_oid their_oids[1];
git_merge_head *their_heads[1];
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
int error;
diff --git a/tests/merge/workdir/renames.c b/tests/merge/workdir/renames.c
index 14308efe0..915a9d9da 100644
--- a/tests/merge/workdir/renames.c
+++ b/tests/merge/workdir/renames.c
@@ -35,7 +35,7 @@ void test_merge_workdir_renames__cleanup(void)
void test_merge_workdir_renames__renames(void)
{
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "68c6c84b091926c7d90aa6a79b2bc3bb6adccd8e", 0, "0a-no-change.txt" },
@@ -77,7 +77,7 @@ void test_merge_workdir_renames__ours(void)
{
git_index *index;
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
@@ -119,7 +119,7 @@ void test_merge_workdir_renames__ours(void)
void test_merge_workdir_renames__similar(void)
{
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
/*
* Note: this differs slightly from the core git merge result - there, 4a is
diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c
index e60b2db18..05278321f 100644
--- a/tests/merge/workdir/simple.c
+++ b/tests/merge/workdir/simple.c
@@ -97,7 +97,7 @@ static git_merge_result *merge_simple_branch(int merge_file_favor, int checkout_
git_oid their_oids[1];
git_merge_head *their_heads[1];
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
cl_git_pass(git_oid_fromstr(&their_oids[0], THEIRS_SIMPLE_OID));
@@ -523,7 +523,7 @@ void test_merge_workdir_simple__directory_file(void)
git_oid their_oids[1], head_commit_id;
git_merge_head *their_heads[1];
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
git_commit *head_commit;
struct merge_index_entry merge_index_entries[] = {
@@ -573,7 +573,7 @@ void test_merge_workdir_simple__unrelated(void)
git_oid their_oids[1];
git_merge_head *their_heads[1];
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
@@ -604,7 +604,7 @@ void test_merge_workdir_simple__unrelated_with_conflicts(void)
git_oid their_oids[1];
git_merge_head *their_heads[1];
git_merge_result *result;
- git_merge_tree_opts merge_opts = GIT_MERGE_TREE_OPTS_INIT;
+ git_merge_options merge_opts = GIT_MERGE_OPTIONS_INIT;
struct merge_index_entry merge_index_entries[] = {
{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" },
diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c
index afbdffefa..694f24710 100644
--- a/tests/revert/workdir.c
+++ b/tests/revert/workdir.c
@@ -398,8 +398,8 @@ void test_revert_workdir__rename_1_of_2(void)
{ 0100644, "0f5bfcf58c558d865da6be0281d7795993646cee", 2, "file6.txt" },
};
- opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
- opts.merge_tree_opts.rename_threshold = 50;
+ opts.merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
+ opts.merge_opts.rename_threshold = 50;
git_oid_fromstr(&head_oid, "cef56612d71a6af8d8015691e4865f7fece905b5");
cl_git_pass(git_commit_lookup(&head, repo, &head_oid));
@@ -432,8 +432,8 @@ void test_revert_workdir__rename(void)
{ "file4.txt", "file5.txt", "" },
};
- opts.merge_tree_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
- opts.merge_tree_opts.rename_threshold = 50;
+ opts.merge_opts.flags |= GIT_MERGE_TREE_FIND_RENAMES;
+ opts.merge_opts.rename_threshold = 50;
git_oid_fromstr(&head_oid, "55568c8de5322ff9a95d72747a239cdb64a19965");
cl_git_pass(git_commit_lookup(&head, repo, &head_oid));
diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c
index fc44898cc..2942099dd 100644
--- a/tests/structinit/structinit.c
+++ b/tests/structinit/structinit.c
@@ -77,8 +77,8 @@ void test_structinit_structinit__compare(void)
/* merge_tree */
CHECK_MACRO_FUNC_INIT_EQUAL( \
- git_merge_tree_opts, GIT_MERGE_TREE_OPTS_VERSION, \
- GIT_MERGE_TREE_OPTS_INIT, git_merge_tree_init_opts);
+ git_merge_options, GIT_MERGE_OPTIONS_VERSION, \
+ GIT_MERGE_OPTIONS_INIT, git_merge_init_options);
/* push */
CHECK_MACRO_FUNC_INIT_EQUAL( \
View Lorry Controller Status