From c833893c64d28d4c017fdbf90bbeb714314a8dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Fri, 20 Sep 2013 22:57:01 +0200 Subject: [PATCH] clone: re-allow using a custom remote name This is a small thing that by itself doesn't quite justify making the user use clone_into. --- include/git2/clone.h | 22 +++++----------------- src/clone.c | 4 +++- tests-clar/clone/nonetwork.c | 9 +++++++++ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/include/git2/clone.h b/include/git2/clone.h index a59de1bc7..bd602fb7a 100644 --- a/include/git2/clone.h +++ b/include/git2/clone.h @@ -35,25 +35,12 @@ GIT_BEGIN_DECL * set the `checkout_strategy` to GIT_CHECKOUT_DEFAULT. * - `bare` should be set to zero to create a standard repo, non-zero for * a bare repo - * - `fetch_progress_cb` is optional callback for fetch progress. Be aware that - * this is called inline with network and indexing operations, so performance - * may be affected. - * - `fetch_progress_payload` is payload for fetch_progress_cb + * - `ignore_cert_errors` should be set to 1 if errors validating the remote host's + * certificate should be ignored. * * ** "origin" remote options: ** * - `remote_name` is the name given to the "origin" remote. The default is * "origin". - * - `pushurl` is a URL to be used for pushing. NULL means use the fetch url. - * - `fetch_spec` is the fetch specification to be used for fetching. NULL - * results in the same behavior as GIT_REMOTE_DEFAULT_FETCH. - * - `push_spec` is the fetch specification to be used for pushing. NULL means - * use the same spec as for fetching. - * - `transport_flags` is flags used to create transport if no transport is - * provided. - * - `transport` is a custom transport to be used for the initial fetch. NULL - * means use the transport autodetected from the URL. - * - `remote_callbacks` may be used to specify custom progress callbacks for - * the origin remote before the fetch is initiated. * - `checkout_branch` gives the name of the branch to checkout. NULL means * use the remote's HEAD. */ @@ -62,10 +49,11 @@ typedef struct git_clone_options { unsigned int version; git_checkout_opts checkout_opts; + git_remote_callbacks *remote_callbacks; + int bare; int ignore_cert_errors; - - git_remote_callbacks *remote_callbacks; + const char *remote_name; const char* checkout_branch; } git_clone_options; diff --git a/src/clone.c b/src/clone.c index 60525939f..cad9ea1dc 100644 --- a/src/clone.c +++ b/src/clone.c @@ -306,8 +306,10 @@ static int create_and_configure_origin( { int error; git_remote *origin = NULL; + const char *name; - if ((error = git_remote_create(&origin, repo, "origin", url)) < 0) + name = options->remote_name ? options->remote_name : "origin"; + if ((error = git_remote_create(&origin, repo, name, url)) < 0) goto on_error; if (options->ignore_cert_errors) diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c index 84654fa5a..c7a219259 100644 --- a/tests-clar/clone/nonetwork.c +++ b/tests-clar/clone/nonetwork.c @@ -122,6 +122,15 @@ void test_clone_nonetwork__fail_with_already_existing_but_non_empty_directory(vo cl_git_fail(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); } +void test_clone_nonetwork__custom_origin_name(void) +{ + g_options.remote_name = "my_origin"; + cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options)); + + cl_git_pass(git_remote_load(&g_remote, g_repo, "my_origin")); +} + + void test_clone_nonetwork__cope_with_already_existing_directory(void) { p_mkdir("./foo", GIT_DIR_MODE);