diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-09-16 05:02:25 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-10-02 06:41:42 +0200 |
| commit | e3c131c544bc79573ebefab4931b5ca89836ace1 (patch) | |
| tree | b64b640a89ad709ba63f31dcc5e6658552e14cb4 /examples/network | |
| parent | d31402a3fc4aa1b7d48ba43fd3bb072e7d69a527 (diff) | |
| download | libgit2-e3c131c544bc79573ebefab4931b5ca89836ace1.tar.gz | |
remote: move the credentials callback to the struct
Move this one as well, letting us have a single way of setting the
callbacks for the remote, and removing fields from the clone options.
Diffstat (limited to 'examples/network')
| -rw-r--r-- | examples/network/clone.c | 2 | ||||
| -rw-r--r-- | examples/network/fetch.c | 2 | ||||
| -rw-r--r-- | examples/network/ls-remote.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/examples/network/clone.c b/examples/network/clone.c index f1002656c..f553c4077 100644 --- a/examples/network/clone.c +++ b/examples/network/clone.c @@ -76,9 +76,9 @@ int do_clone(git_repository *repo, int argc, char **argv) checkout_opts.progress_payload = &pd; clone_opts.checkout_opts = checkout_opts; callbacks.transfer_progress = &fetch_progress; + callbacks.credentials = cred_acquire_cb; callbacks.payload = &pd; clone_opts.remote_callbacks = &callbacks; - clone_opts.cred_acquire_cb = cred_acquire_cb; // Do the clone error = git_clone(&cloned_repo, url, path, &clone_opts); diff --git a/examples/network/fetch.c b/examples/network/fetch.c index 1de223373..0c545ad7e 100644 --- a/examples/network/fetch.c +++ b/examples/network/fetch.c @@ -91,8 +91,8 @@ int fetch(git_repository *repo, int argc, char **argv) // Set up the callbacks (only update_tips for now) callbacks.update_tips = &update_cb; callbacks.progress = &progress_cb; + callbacks.credentials = cred_acquire_cb; git_remote_set_callbacks(remote, &callbacks); - git_remote_set_cred_acquire_cb(remote, &cred_acquire_cb, NULL); // Set up the information for the background worker thread data.remote = remote; diff --git a/examples/network/ls-remote.c b/examples/network/ls-remote.c index b22ac47a0..b65759ed3 100644 --- a/examples/network/ls-remote.c +++ b/examples/network/ls-remote.c @@ -18,6 +18,7 @@ static int use_remote(git_repository *repo, char *name) { git_remote *remote = NULL; int error; + git_remote_callbacks callbacks = GIT_REMOTE_CALLBACKS_INIT; // Find the remote by name error = git_remote_load(&remote, repo, name); @@ -27,7 +28,8 @@ static int use_remote(git_repository *repo, char *name) goto cleanup; } - git_remote_set_cred_acquire_cb(remote, &cred_acquire_cb, NULL); + callbacks.credentials = cred_acquire_cb; + git_remote_set_callbacks(remote, &callbacks); error = git_remote_connect(remote, GIT_DIRECTION_FETCH); if (error < 0) |