vendor/libgit2/src/fetch.c in rugged-0.27.9 vs vendor/libgit2/src/fetch.c in rugged-0.27.10

- old
+ new

@@ -76,11 +76,11 @@ if (remote->active_refspecs.length == 0) { if ((error = git_refspec__parse(&head, "HEAD", true)) < 0) goto cleanup; error = git_refspec__dwim_one(&remote->active_refspecs, &head, &remote->refs); - git_refspec__free(&head); + git_refspec__dispose(&head); if (error < 0) goto cleanup; } @@ -94,11 +94,11 @@ if ((error = maybe_want(remote, heads[i], odb, &tagspec, tagopt)) < 0) break; } cleanup: - git_refspec__free(&tagspec); + git_refspec__dispose(&tagspec); return error; } /* @@ -111,11 +111,11 @@ git_transport *t = remote->transport; remote->need_pack = 0; if (filter_wants(remote, opts) < 0) { - giterr_set(GITERR_NET, "failed to filter the reference list for wants"); + git_error_set(GIT_ERROR_NET, "failed to filter the reference list for wants"); return -1; } /* Don't try to negotiate when we don't want anything */ if (!remote->need_pack) @@ -132,11 +132,11 @@ } int git_fetch_download_pack(git_remote *remote, const git_remote_callbacks *callbacks) { git_transport *t = remote->transport; - git_transfer_progress_cb progress = NULL; + git_indexer_progress_cb progress = NULL; void *payload = NULL; if (!remote->need_pack) return 0; @@ -146,11 +146,16 @@ } return t->download_pack(t, remote->repo, &remote->stats, progress, payload); } -int git_fetch_init_options(git_fetch_options *opts, unsigned int version) +int git_fetch_options_init(git_fetch_options *opts, unsigned int version) { GIT_INIT_STRUCTURE_FROM_TEMPLATE( opts, version, git_fetch_options, GIT_FETCH_OPTIONS_INIT); return 0; +} + +int git_fetch_init_options(git_fetch_options *opts, unsigned int version) +{ + return git_fetch_options_init(opts, version); }