diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2014-03-11 22:47:39 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2014-03-20 09:25:08 -0700 |
| commit | 5aa2ac6de1622308884fd542f7b29e6810a0e98e (patch) | |
| tree | 350898e99181e7b2c7d6db4da667d384ef90ef49 /tests/revert/workdir.c | |
| parent | 02105a27f01509ce4e641487cae040662ee477a2 (diff) | |
| download | libgit2-5aa2ac6de1622308884fd542f7b29e6810a0e98e.tar.gz | |
Update git_merge_tree_opts to git_merge_options
Diffstat (limited to 'tests/revert/workdir.c')
| -rw-r--r-- | tests/revert/workdir.c | 8 |
1 files changed, 4 insertions, 4 deletions
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)); |