From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v3 40/44] refs: allow ref backend to be set for clone Date: Mon, 12 Oct 2015 17:52:01 -0400 Message-ID: <1444686725-27660-42-git-send-email-dturner@twopensource.com> References: <1444686725-27660-1-git-send-email-dturner@twopensource.com> Cc: David Turner To: git@vger.kernel.org, mhagger@alum.mit.edu X-From: git-owner@vger.kernel.org Mon Oct 12 23:53:31 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Zll29-0005Ke-Sd for gcvg-git-2@plane.gmane.org; Mon, 12 Oct 2015 23:53:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751782AbbJLVxU (ORCPT ); Mon, 12 Oct 2015 17:53:20 -0400 Received: from mail-qg0-f46.google.com ([209.85.192.46]:34633 "EHLO mail-qg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752613AbbJLVw5 (ORCPT ); Mon, 12 Oct 2015 17:52:57 -0400 Received: by qgez77 with SMTP id z77so130225900qge.1 for ; Mon, 12 Oct 2015 14:52:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=SbWyrE5nG18DW6XNHtmemU8tl5uuTa+v5YtukJLoxLw=; b=U5LV3auHIO9DIJMCLuUNkpH5mlLxklc/LGOz1BH6Xbb5GMcS8p5G9y8tLWwul/51wR 8qxlynam3H1lhMUB8KYYEVtmk26ZLjTXcrJpUR+Wk7lTitbm400Fj28IDbhDAb3QFjvf 1pmYvxJ3m/f9gwucqiovzJue0Uw5xQ9PtkNDPvHBoHeRaKGXwhvLoUufP/VO9LZQPKsM B6g1zk7kKnotcyNzy9sd5wuIqyYy4RB0U3rZ3L5kj/wXXd9JqOt21cbIwHzZlHEBst18 CzzQ09RKRdDfuSLAKmDvfcQ37JsKo0XIUnv+uu4ylKg/DklYZ6JL/2f2du+On6+BknK2 VSNg== X-Gm-Message-State: ALoCoQlPCAGbRfKI/Ss/W2JWdupn9H0D7P/UjboyVVAB2fTFbtMbEMp6TyJVuMvgMxjXYyLTV+1x X-Received: by 10.140.32.247 with SMTP id h110mr35189271qgh.1.1444686777241; Mon, 12 Oct 2015 14:52:57 -0700 (PDT) Received: from ubuntu.jfk4.office.twttr.net ([192.133.79.147]) by smtp.gmail.com with ESMTPSA id q140sm7865647qha.5.2015.10.12.14.52.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 12 Oct 2015 14:52:56 -0700 (PDT) X-Mailer: git-send-email 2.4.2.644.g97b850b-twtrsrc In-Reply-To: <1444686725-27660-1-git-send-email-dturner@twopensource.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add a new option, --refs-backend-type, to allow the ref backend type to be set on new clones. Submodules must use the same ref backend as the parent repository, so we also pass the --refs-backend-type option option when cloning submodules. Signed-off-by: David Turner --- Documentation/git-clone.txt | 4 ++++ builtin/clone.c | 27 +++++++++++++++++++++++++-- builtin/submodule--helper.c | 5 ++++- cache.h | 1 + refs.c | 2 ++ 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f1f2a3f..d7a4cb0 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -14,6 +14,7 @@ SYNOPSIS [-o ] [-b ] [-u ] [--reference ] [--dissociate] [--separate-git-dir ] [--depth ] [--[no-]single-branch] + [--refs-backend-type=] [--recursive | --recurse-submodules] [--] [] @@ -216,6 +217,9 @@ objects from the source repository into a pack in the cloned repository. The result is Git repository can be separated from working tree. +--refs-backend-type=:: + Type of refs backend. Default is to use the original files based + backend. :: The (possibly remote) repository to clone from. See the diff --git a/builtin/clone.c b/builtin/clone.c index 3e14491..d489a87 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -92,11 +92,13 @@ static struct option builtin_clone_options[] = { N_("separate git dir from working tree")), OPT_STRING_LIST('c', "config", &option_config, N_("key=value"), N_("set config inside the new repository")), + OPT_STRING(0, "refs-backend-type", &refs_backend_type, + N_("name"), N_("name of backend type to use")), OPT_END() }; static const char *argv_submodule[] = { - "submodule", "update", "--init", "--recursive", NULL + "submodule", "update", "--init", "--recursive", NULL, NULL }; static const char *get_repo_path_1(struct strbuf *path, int *is_bundle) @@ -724,8 +726,24 @@ static int checkout(void) err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1), sha1_to_hex(sha1), "1", NULL); - if (!err && option_recursive) + if (!err && option_recursive) { + const char **backend_arg = argv_submodule; + char *new_backend_arg = NULL; + if (refs_backend_type) { + while (*backend_arg) + ++backend_arg; + + new_backend_arg = xmalloc(21 + strlen(refs_backend_type)); + sprintf(new_backend_arg, "--refs-backend-type=%s", + refs_backend_type); + *backend_arg = new_backend_arg; + } err = run_command_v_opt(argv_submodule, RUN_GIT_CMD); + if (refs_backend_type) { + free(new_backend_arg); + *backend_arg = NULL; + } + } return err; } @@ -744,6 +762,11 @@ static void write_config(struct string_list *config) write_one_config, NULL) < 0) die("unable to write parameters to config file"); } + + if (refs_backend_type && + write_one_config("core.refs-backend-type", + refs_backend_type, NULL) < 0) + die("unable to write backend parameter to config file"); } static void write_refspec_config(const char *src_ref_prefix, diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index f4c3eff..5c9ca4e 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -140,7 +140,10 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url argv_array_pushl(&cp.args, "--reference", reference, NULL); if (gitdir && *gitdir) argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL); - + if (refs_backend_type && *refs_backend_type) { + argv_array_push(&cp.args, "--refs-backend-type"); + argv_array_push(&cp.args, refs_backend_type); + } argv_array_push(&cp.args, url); argv_array_push(&cp.args, path); diff --git a/cache.h b/cache.h index cc817dc..692cfd3 100644 --- a/cache.h +++ b/cache.h @@ -695,6 +695,7 @@ enum object_creation_mode { extern enum object_creation_mode object_creation_mode; extern char *notes_ref_name; +extern const char *refs_backend_type; extern int grafts_replace_parents; diff --git a/refs.c b/refs.c index 025cc08..901558d 100644 --- a/refs.c +++ b/refs.c @@ -21,6 +21,8 @@ struct ref_be *the_refs_backend = &refs_be_files; */ struct ref_be *refs_backends = &refs_be_files; +const char *refs_backend_type; + /* * This function is used to switch to an alternate backend. */ -- 2.4.2.644.g97b850b-twtrsrc