git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, mhagger@alum.mit.edu
Cc: David Turner <dturner@twopensource.com>
Subject: [PATCH 40/43] refs: allow ref backend to be set for clone
Date: Wed,  2 Sep 2015 21:55:10 -0400	[thread overview]
Message-ID: <1441245313-11907-41-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1441245313-11907-1-git-send-email-dturner@twopensource.com>

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 <dturner@twopensource.com>
---
 Documentation/git-clone.txt |  4 ++++
 builtin/clone.c             | 27 +++++++++++++++++++++++++--
 builtin/submodule--helper.c |  4 ++++
 cache.h                     |  1 +
 refs.c                      |  2 ++
 5 files changed, 36 insertions(+), 2 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 <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
 	  [--dissociate] [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch]
+	  [--refs-backend-type=<name>]
 	  [--recursive | --recurse-submodules] [--] <repository>
 	  [<directory>]
 
@@ -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=<name>::
+	Type of refs backend. Default is to use the original files based
+	backend.
 
 <repository>::
 	The (possibly remote) repository to clone from.  See the
diff --git a/builtin/clone.c b/builtin/clone.c
index cf19eeb..539eed9 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)
@@ -717,8 +719,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;
 }
@@ -737,6 +755,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 adfa0e4..a2ed0cc 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -150,6 +150,10 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
 		argv_array_push(&cp.args, "--separate-git-dir");
 		argv_array_push(&cp.args, gitdir);
 	}
+	if (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 a9669de..6193143 100644
--- a/cache.h
+++ b/cache.h
@@ -694,6 +694,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 3f8fa8e..3a2cafb 100644
--- a/refs.c
+++ b/refs.c
@@ -16,6 +16,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.0.4.315.gad8727a-twtrsrc

  parent reply	other threads:[~2015-09-03  1:56 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-03  1:54 [PATCH 00/43] refs lmdb backend David Turner
2015-09-03  1:54 ` [PATCH 01/43] refs.c: create a public version of verify_refname_available David Turner
2015-09-03 23:08   ` Junio C Hamano
2015-09-04 15:45     ` David Turner
2015-09-03  1:54 ` [PATCH 02/43] refs: make repack_without_refs and is_branch public David Turner
2015-09-03  1:54 ` [PATCH 04/43] refs.c: add a new refs.c file to hold all common refs code David Turner
2015-09-03  1:54 ` [PATCH 05/43] refs.c: move update_ref to refs.c David Turner
2015-09-03  1:54 ` [PATCH 06/43] refs.c: move delete_ref and delete_refs to the common code David Turner
2015-09-03  1:54 ` [PATCH 07/43] refs.c: move read_ref_at to the common refs file David Turner
2015-09-03  1:54 ` [PATCH 08/43] refs.c: move the hidden refs functions to the common code David Turner
2015-09-03  1:54 ` [PATCH 09/43] refs.c: move dwim and friend functions to the common refs code David Turner
2015-09-03  1:54 ` [PATCH 10/43] refs.c: move warn_if_dangling_symref* to the common code David Turner
2015-09-03  1:54 ` [PATCH 11/43] refs.c: move read_ref, read_ref_full and ref_exists " David Turner
2015-09-03  1:54 ` [PATCH 12/43] refs.c: move resolve_refdup to common David Turner
2015-09-03  1:54 ` [PATCH 13/43] refs.c: move check_refname_format to the common code David Turner
2015-09-03  1:54 ` [PATCH 14/43] refs.c: move is_branch " David Turner
2015-09-03  1:54 ` [PATCH 15/43] refs.c: move prettify_refname " David Turner
2015-09-03  1:54 ` [PATCH 16/43] refs.c: move ref iterators " David Turner
2015-09-03  1:54 ` [PATCH 17/43] refs.c: move head_ref_namespaced " David Turner
2015-09-03  1:54 ` [PATCH 18/43] refs-be-files.c: add a backend method structure with transaction functions David Turner
2015-09-03  1:54 ` [PATCH 19/43] refs-be-files.c: add methods for misc ref operations David Turner
2015-09-03  1:54 ` [PATCH 20/43] refs-be-files.c: add methods for the ref iterators David Turner
2015-09-25 20:54   ` Junio C Hamano
2015-09-25 21:28     ` David Turner
2015-09-25 21:33       ` Junio C Hamano
2015-09-03  1:54 ` [PATCH 21/43] refs-be-files.c: add method for for_each_reftype_ David Turner
2015-09-03  1:54 ` [PATCH 22/43] refs-be-files.c: add do_for_each_per_worktree_ref David Turner
2015-09-03  1:54 ` [PATCH 23/43] refs.c: move refname_is_safe to the common code David Turner
2015-09-03  1:54 ` [PATCH 24/43] refs.h: document make refname_is_safe and add it to header David Turner
2015-09-03  2:06   ` David Turner
2015-09-03  1:54 ` [PATCH 25/43] refs.c: move copy_msg to the common code David Turner
2015-09-03  1:54 ` [PATCH 26/43] refs.c: move peel_object " David Turner
2015-09-03  1:54 ` [PATCH 27/43] refs.c: move should_autocreate_reflog to " David Turner
2015-09-03  1:54 ` [PATCH 28/43] refs.c: add ref backend init function David Turner
2015-09-03  1:54 ` [PATCH 29/43] refs.c: add methods for reflog David Turner
2015-09-03  1:55 ` [PATCH 30/43] refs.c: add method for initial ref transaction commit David Turner
2015-09-03  1:55 ` [PATCH 31/43] initdb: move safe_create_dir into common code David Turner
2015-09-03  1:55 ` [PATCH 32/43] refs.c: add method for initializing refs db David Turner
2015-09-03  1:55 ` [PATCH 33/43] refs.c: make struct ref_transaction generic David Turner
2015-09-03  1:55 ` [PATCH 34/43] refs-be-files.c: add method to rename refs David Turner
2015-09-03  1:55 ` [PATCH 35/43] refs-be-files.c: add method to expire reflogs David Turner
2015-09-03  1:55 ` [PATCH 36/43] run-command: track total number of commands run David Turner
2015-09-03  1:55 ` [PATCH 37/43] refs: move some defines from refs-be-files.c to refs.h David Turner
2015-09-03  1:55 ` [PATCH 38/43] refs: make some files backend functions public David Turner
2015-09-03  1:55 ` [PATCH 39/43] refs: break out a ref conflict check David Turner
2015-09-03  1:55 ` David Turner [this message]
2015-09-03  1:55 ` [PATCH 41/43] refs: add register_refs_backend David Turner
2015-09-03  1:55 ` [PATCH 42/43] refs: add LMDB refs backend David Turner
2015-09-03 23:16   ` Junio C Hamano
2015-09-03  1:55 ` [PATCH 43/43] refs: tests for db backend David Turner
2015-09-03 23:10 ` [PATCH 00/43] refs lmdb backend Junio C Hamano
2015-09-04 16:01   ` David Turner
2015-09-17  0:09     ` David Turner
2015-09-17 16:33       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1441245313-11907-41-git-send-email-dturner@twopensource.com \
    --to=dturner@twopensource.com \
    --cc=git@vger.kernel.org \
    --cc=mhagger@alum.mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).