New upstream version 1.4.3+dfsg.1

[libgit2.git] / tests / merge / trees / automerge.c

diff --git a/tests/merge/trees/automerge.c b/tests/merge/trees/automerge.c
index 79069d81defbfb9aee60a695f4932bd5a514d960..3bf6c5208442f002989fab4573ac57dfc1b652c2 100644 (file)
--- a/tests/merge/trees/automerge.c
+++ b/tests/merge/trees/automerge.c
@@ -1,10 +1,10 @@
 #include "clar_libgit2.h"
 #include "git2/repository.h"
 #include "git2/merge.h"
-#include "buffer.h"
 #include "merge.h"
+#include "futils.h"
 #include "../merge_helpers.h"
-#include "fileops.h"
+#include "../conflict_data.h"
 
 static git_repository *repo;
 
@@ -54,7 +54,7 @@ static git_repository *repo;
          "", \
          "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5" }
 
-// Fixture setup and teardown
+/* Fixture setup and teardown */
 void test_merge_trees_automerge__initialize(void)
 {
        repo = cl_git_sandbox_init(TEST_REPO_PATH);
@@ -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[] = {
@@ -99,7 +99,7 @@ void test_merge_trees_automerge__automerge(void)
        cl_assert((entry = git_index_get_bypath(index, "automergeable.txt", 0)) != NULL);
        cl_assert(entry->file_size == strlen(AUTOMERGEABLE_MERGED_FILE));
 
-       cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJ_BLOB));
+       cl_git_pass(git_object_lookup((git_object **)&blob, repo, &entry->id, GIT_OBJECT_BLOB));
        cl_assert(memcmp(git_blob_rawcontent(blob), AUTOMERGEABLE_MERGED_FILE, (size_t)entry->file_size) == 0);
 
        git_index_free(index);
@@ -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" },