diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-12 12:25:25 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-12 12:33:55 +0200 |
commit | 0f69b41d2ecec60beafd1cbf1c50fdf3502200a4 (patch) | |
tree | 1aef4a03cc8b571f5617fe01cd8e016541a8d968 | |
parent | 6042a050f97091615b5925698627b5c0e2aa56cf (diff) | |
download | libgit2-0f69b41d2ecec60beafd1cbf1c50fdf3502200a4.tar.gz |
push: pass the callbacks during setup as well
We need to pass these options in order to have the credentials callback
set.
-rw-r--r-- | tests/online/push.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/online/push.c b/tests/online/push.c index 04ad7a2ed..6cd444320 100644 --- a/tests/online/push.c +++ b/tests/online/push.c @@ -319,6 +319,8 @@ void test_online_push__initialize(void) git_vector delete_specs = GIT_VECTOR_INIT; const git_remote_head **heads; size_t heads_len; + git_push_options push_opts = GIT_PUSH_OPTIONS_INIT; + git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; _repo = cl_git_sandbox_init("push_src"); @@ -370,7 +372,7 @@ void test_online_push__initialize(void) record_callbacks_data_clear(&_record_cbs_data); - cl_git_pass(git_remote_connect(_remote, GIT_DIRECTION_PUSH, NULL)); + cl_git_pass(git_remote_connect(_remote, GIT_DIRECTION_PUSH, &_record_cbs)); /* Clean up previously pushed branches. Fails if receive.denyDeletes is * set on the remote. Also, on Git 1.7.0 and newer, you must run @@ -386,14 +388,16 @@ void test_online_push__initialize(void) delete_specs.length, }; - cl_git_pass(git_remote_upload(_remote, &arr, NULL)); + memcpy(&push_opts.callbacks, &_record_cbs, sizeof(git_remote_callbacks)); + cl_git_pass(git_remote_upload(_remote, &arr, &push_opts)); } git_remote_disconnect(_remote); git_vector_free(&delete_specs); /* Now that we've deleted everything, fetch from the remote */ - cl_git_pass(git_remote_fetch(_remote, NULL, NULL, NULL)); + memcpy(&fetch_opts.callbacks, &_record_cbs, sizeof(git_remote_callbacks)); + cl_git_pass(git_remote_fetch(_remote, NULL, &fetch_opts, NULL)); } void test_online_push__cleanup(void) |