diff options
Diffstat (limited to 'tests/online/fetchhead.c')
| -rw-r--r-- | tests/online/fetchhead.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/online/fetchhead.c b/tests/online/fetchhead.c index 9a97abef3..200edacfd 100644 --- a/tests/online/fetchhead.c +++ b/tests/online/fetchhead.c @@ -12,12 +12,12 @@ static git_clone_options g_options; void test_online_fetchhead__initialize(void) { - git_remote_callbacks dummy_callbacks = GIT_REMOTE_CALLBACKS_INIT; + git_fetch_options dummy_fetch = GIT_FETCH_OPTIONS_INIT; g_repo = NULL; memset(&g_options, 0, sizeof(git_clone_options)); g_options.version = GIT_CLONE_OPTIONS_VERSION; - g_options.remote_callbacks = dummy_callbacks; + g_options.fetch_opts = dummy_fetch; } void test_online_fetchhead__cleanup(void) @@ -38,12 +38,13 @@ static void fetchhead_test_clone(void) static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fetchhead) { git_remote *remote; + git_fetch_options fetch_opts = GIT_FETCH_OPTIONS_INIT; git_buf fetchhead_buf = GIT_BUF_INIT; int equals = 0; git_strarray array, *active_refs = NULL; cl_git_pass(git_remote_lookup(&remote, g_repo, "origin")); - git_remote_set_autotag(remote, GIT_REMOTE_DOWNLOAD_TAGS_AUTO); + fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_AUTO; if(fetchspec != NULL) { array.count = 1; @@ -51,10 +52,7 @@ static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fet active_refs = &array; } - cl_git_pass(git_remote_connect(remote, GIT_DIRECTION_FETCH)); - cl_git_pass(git_remote_download(remote, active_refs)); - cl_git_pass(git_remote_update_tips(remote, NULL)); - git_remote_disconnect(remote); + cl_git_pass(git_remote_fetch(remote, active_refs, &fetch_opts, NULL)); git_remote_free(remote); cl_git_pass(git_futils_readbuffer(&fetchhead_buf, "./foo/.git/FETCH_HEAD")); |