diff options
| author | Ben Straub <bs@github.com> | 2014-01-04 05:42:09 +0400 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2014-03-06 21:44:52 +0400 |
| commit | aa17c3c63c3e31155015572cf208d89def9fce0c (patch) | |
| tree | 96dc9dd338ccbaa7ef5201a47a97729e5f63ada9 /tests | |
| parent | 6affd71f33f9a9693425d6f3599ba1f25226c34b (diff) | |
git_revert_opts -> git_revert_optionsoptions-names
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/revert/workdir.c | 12 | ||||
| -rw-r--r-- | tests/structinit/structinit.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c index 47abeb8f0..afbdffefa 100644 --- a/tests/revert/workdir.c +++ b/tests/revert/workdir.c @@ -347,7 +347,7 @@ void test_revert_workdir__conflict_use_ours(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; - git_revert_opts opts = GIT_REVERT_OPTS_INIT; + git_revert_options opts = GIT_REVERT_OPTIONS_INIT; struct merge_index_entry merge_index_entries[] = { { 0100644, "caf99de3a49827117bb66721010eac461b06a80c", 0, "file1.txt" }, @@ -387,7 +387,7 @@ void test_revert_workdir__rename_1_of_2(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; - git_revert_opts opts = GIT_REVERT_OPTS_INIT; + git_revert_options opts = GIT_REVERT_OPTIONS_INIT; struct merge_index_entry merge_index_entries[] = { { 0100644, "747726e021bc5f44b86de60e3032fd6f9f1b8383", 0, "file1.txt" }, @@ -421,7 +421,7 @@ void test_revert_workdir__rename(void) { git_commit *head, *commit; git_oid head_oid, revert_oid; - git_revert_opts opts = GIT_REVERT_OPTS_INIT; + git_revert_options opts = GIT_REVERT_OPTIONS_INIT; struct merge_index_entry merge_index_entries[] = { { 0100644, "55acf326a69f0aab7a974ec53ffa55a50bcac14e", 1, "file4.txt" }, @@ -480,7 +480,7 @@ void test_revert_workdir__nonmerge_fails_mainline_specified(void) { git_reference *head; git_commit *commit; - git_revert_opts opts = GIT_REVERT_OPTS_INIT; + git_revert_options opts = GIT_REVERT_OPTIONS_INIT; cl_git_pass(git_repository_head(&head, repo)); cl_git_pass(git_reference_peel((git_object **)&commit, head, GIT_OBJ_COMMIT)); @@ -518,7 +518,7 @@ void test_revert_workdir__merge_first_parent(void) { git_commit *head; git_oid head_oid; - git_revert_opts opts = GIT_REVERT_OPTS_INIT; + git_revert_options opts = GIT_REVERT_OPTIONS_INIT; struct merge_index_entry merge_index_entries[] = { { 0100644, "296a6d3be1dff05c5d1f631d2459389fa7b619eb", 0, "file-mainline.txt" }, @@ -543,7 +543,7 @@ void test_revert_workdir__merge_second_parent(void) { git_commit *head; git_oid head_oid; - git_revert_opts opts = GIT_REVERT_OPTS_INIT; + git_revert_options opts = GIT_REVERT_OPTIONS_INIT; struct merge_index_entry merge_index_entries[] = { { 0100644, "33c6fd981c49a2abf2971482089350bfc5cda8ea", 0, "file-branch.txt" }, diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index ec4f43999..1df970d49 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -92,8 +92,8 @@ void test_structinit_structinit__compare(void) /* revert */ CHECK_MACRO_FUNC_INIT_EQUAL( \ - git_revert_opts, GIT_REVERT_OPTS_VERSION, \ - GIT_REVERT_OPTS_INIT, git_revert_init_opts); + git_revert_options, GIT_REVERT_OPTIONS_VERSION, \ + GIT_REVERT_OPTIONS_INIT, git_revert_init_opts); /* status */ CHECK_MACRO_FUNC_INIT_EQUAL( \ |