diff options
| author | Vicent Marti <vicent@github.com> | 2014-03-24 18:09:13 +0100 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-03-24 18:09:13 +0100 |
| commit | 85a41fc4bf148dc954fa8124b61355ee648c40ba (patch) | |
| tree | 477ab7f38edf350dff922e9b21612f4d71ae3c76 /tests/structinit/structinit.c | |
| parent | f57cc63811db2717e9ba42e720a75f71557f9451 (diff) | |
| parent | 58c2b1c4218a2f90ee2745687f2e17670bde0b1b (diff) | |
| download | libgit2-85a41fc4bf148dc954fa8124b61355ee648c40ba.tar.gz | |
Merge pull request #2183 from ethomson/merge_refactor
Refactor the `git_merge` API
Diffstat (limited to 'tests/structinit/structinit.c')
| -rw-r--r-- | tests/structinit/structinit.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index 1df970d49..2942099dd 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -65,15 +65,20 @@ void test_structinit_structinit__compare(void) git_diff_find_options, GIT_DIFF_FIND_OPTIONS_VERSION, \ GIT_DIFF_FIND_OPTIONS_INIT, git_diff_find_init_options); - /* merge_tree */ + /* merge_file_input */ + CHECK_MACRO_FUNC_INIT_EQUAL( \ + git_merge_file_input, GIT_MERGE_FILE_INPUT_VERSION, \ + GIT_MERGE_FILE_INPUT_INIT, git_merge_file_init_input); + + /* merge_file */ 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_file_options, GIT_MERGE_FILE_OPTIONS_VERSION, \ + GIT_MERGE_FILE_OPTIONS_INIT, git_merge_file_init_options); - /* merge */ + /* merge_tree */ CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_merge_opts, GIT_MERGE_OPTS_VERSION, \ - GIT_MERGE_OPTS_INIT, git_merge_init_opts); + git_merge_options, GIT_MERGE_OPTIONS_VERSION, \ + GIT_MERGE_OPTIONS_INIT, git_merge_init_options); /* push */ CHECK_MACRO_FUNC_INIT_EQUAL( \ |