diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-04-20 17:19:08 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-04-20 17:19:08 -0400 |
| commit | 94c988f6d6f4930ee4c120f6ce7932b5e49637be (patch) | |
| tree | f52538e92e43ff0a1fd320171113ab505368a1cf /tests/rebase | |
| parent | 7838235890b10e1e3c6ceb2c696c4721ad438246 (diff) | |
| download | libgit2-94c988f6d6f4930ee4c120f6ce7932b5e49637be.tar.gz | |
rebase: include checkout opts within rebase opts
Diffstat (limited to 'tests/rebase')
| -rw-r--r-- | tests/rebase/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/rebase/merge.c b/tests/rebase/merge.c index 4371f1f1f..12f0de5a0 100644 --- a/tests/rebase/merge.c +++ b/tests/rebase/merge.c @@ -533,7 +533,8 @@ void test_rebase_merge__custom_checkout_options(void) checkout_options.progress_cb = rebase_checkout_progress_cb; checkout_options.progress_payload = &called; - rebase_options.checkout_options = &checkout_options; + memcpy(&rebase_options.checkout_options, &checkout_options, + sizeof(git_checkout_options)); cl_git_pass(git_reference_lookup(&branch_ref, repo, "refs/heads/beef")); cl_git_pass(git_reference_lookup(&upstream_ref, repo, "refs/heads/master")); |