diff options
Diffstat (limited to 'tests-clar/merge/merge_helpers.h')
-rw-r--r-- | tests-clar/merge/merge_helpers.h | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/tests-clar/merge/merge_helpers.h b/tests-clar/merge/merge_helpers.h deleted file mode 100644 index cb718e01a..000000000 --- a/tests-clar/merge/merge_helpers.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef INCLUDE_cl_merge_helpers_h__ -#define INCLUDE_cl_merge_helpers_h__ - -#include "merge.h" -#include "git2/merge.h" - -struct merge_index_entry { - uint16_t mode; - char oid_str[41]; - int stage; - char path[128]; -}; - -struct merge_name_entry { - char ancestor_path[128]; - char our_path[128]; - char their_path[128]; -}; - -struct merge_index_with_status { - struct merge_index_entry entry; - unsigned int status; -}; - -struct merge_reuc_entry { - char path[128]; - unsigned int ancestor_mode; - unsigned int our_mode; - unsigned int their_mode; - char ancestor_oid_str[41]; - char our_oid_str[41]; - char their_oid_str[41]; -}; - -struct merge_index_conflict_data { - struct merge_index_with_status ancestor; - struct merge_index_with_status ours; - struct merge_index_with_status theirs; - git_merge_diff_type_t change_type; -}; - -int merge_trees_from_branches( - git_index **index, git_repository *repo, - const char *ours_name, const char *theirs_name, - git_merge_tree_opts *opts); - -int merge_test_diff_list(git_merge_diff_list *diff_list, const struct merge_index_entry expected[], size_t expected_len); - -int merge_test_merge_conflicts(git_vector *conflicts, const struct merge_index_conflict_data expected[], size_t expected_len); - -int merge_test_index(git_index *index, const struct merge_index_entry expected[], size_t expected_len); - -int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len); - -int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[], size_t expected_len); - -int merge_test_workdir(git_repository *repo, const struct merge_index_entry expected[], size_t expected_len); - -#endif |