From: David Turner <dturner@twopensource.com>
To: git@vger.kernel.org, peff@peff.net, mhagger@alum.mit.edu,
pclouds@gmail.com
Cc: "David Turner" <dturner@twopensource.com>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v7 26/33] clone: allow ref storage backend to be set for clone
Date: Mon, 29 Feb 2016 19:52:59 -0500 [thread overview]
Message-ID: <1456793586-22082-27-git-send-email-dturner@twopensource.com> (raw)
In-Reply-To: <1456793586-22082-1-git-send-email-dturner@twopensource.com>
Add a new option, --ref-storage, to allow the ref storage backend to
be set on new clones.
Submodules must use the same ref storage as the parent repository, so
we also pass the --ref-storage option option when cloning
submodules.
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git-clone.txt | 5 +++++
builtin/clone.c | 5 +++++
builtin/submodule--helper.c | 2 +-
contrib/completion/git-completion.bash | 1 +
git-submodule.sh | 13 +++++++++++++
5 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 9a95c6e..a5a48cb 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]
+ [--ref-storage=<name>]
[--recursive | --recurse-submodules] [--jobs <n>] [--] <repository>
[<directory>]
@@ -232,6 +233,10 @@ objects from the source repository into a pack in the cloned repository.
The number of submodules fetched at the same time.
Defaults to the `submodule.fetchJobs` option.
+--ref-storage=<name>::
+ Type of ref storage backend. Default is to use the original files
+ based ref storage.
+
<repository>::
The (possibly remote) repository to clone from. See the
<<URLS,URLS>> section below for more information on specifying
diff --git a/builtin/clone.c b/builtin/clone.c
index d1c9bcf..ed524e9 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -114,6 +114,8 @@ static struct option builtin_clone_options[] = {
TRANSPORT_FAMILY_IPV4),
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
TRANSPORT_FAMILY_IPV6),
+ OPT_STRING(0, "ref-storage", &ref_storage_backend,
+ N_("name"), N_("name of backend type to use")),
OPT_END()
};
@@ -752,6 +754,9 @@ static int checkout(void)
if (max_jobs != -1)
argv_array_pushf(&args, "--jobs=%d", max_jobs);
+ argv_array_pushl(&args, "--ref-storage",
+ ref_storage_backend, NULL);
+
err = run_command_v_opt(args.argv, RUN_GIT_CMD);
argv_array_clear(&args);
}
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index ed4f60b..f8cdce9 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -444,7 +444,7 @@ 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);
-
+ argv_array_pushl(&cp.args, "--ref-storage", ref_storage_backend, NULL);
argv_array_push(&cp.args, url);
argv_array_push(&cp.args, path);
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 850afd0..a0225f4 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1092,6 +1092,7 @@ _git_clone ()
--depth
--single-branch
--branch
+ --ref-storage=
"
return
;;
diff --git a/git-submodule.sh b/git-submodule.sh
index 3924bff..5562a19 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -545,6 +545,14 @@ cmd_update()
--checkout)
update="checkout"
;;
+ --ref-storage=*)
+ ref_storage="$1"
+ ;;
+ --ref-storage)
+ case "$2" in '') usage ;; esac
+ ref_storage="$2"
+ shift
+ ;;
--depth)
case "$2" in '') usage ;; esac
depth="--depth=$2"
@@ -578,6 +586,11 @@ cmd_update()
if test -n "$init"
then
cmd_init "--" "$@" || return
+ else
+ if test -n "$ref_storage"
+ then
+ usage
+ fi
fi
{
--
2.4.2.767.g62658d5-twtrsrc
next prev parent reply other threads:[~2016-03-01 0:54 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-01 0:52 [PATCH v7 00/33] refs backend David Turner
2016-03-01 0:52 ` [PATCH v7 01/33] setup: call setup_git_directory_gently before accessing refs David Turner
2016-03-01 8:35 ` Jeff King
2016-03-01 23:47 ` David Turner
2016-03-02 0:33 ` David Turner
2016-03-02 2:45 ` Jeff King
2016-03-01 0:52 ` [PATCH v7 02/33] refs: move head_ref{,_submodule} to the common code David Turner
2016-03-01 0:52 ` [PATCH v7 03/33] refs: move for_each_*ref* functions into " David Turner
2016-03-01 0:52 ` [PATCH v7 04/33] files-backend: break out ref reading David Turner
2016-03-20 5:03 ` Michael Haggerty
2016-03-22 8:33 ` Michael Haggerty
2016-03-23 10:19 ` Michael Haggerty
2016-03-01 0:52 ` [PATCH v7 05/33] refs: move resolve_ref_unsafe into common code David Turner
2016-03-01 0:52 ` [PATCH v7 06/33] refs: add a backend method structure with transaction functions David Turner
2016-03-01 0:52 ` [PATCH v7 07/33] refs: add methods for misc ref operations David Turner
2016-03-01 0:52 ` [PATCH v7 08/33] refs: add method for do_for_each_ref David Turner
2016-03-01 0:52 ` [PATCH v7 09/33] refs: reduce the visibility of do_for_each_ref() David Turner
2016-03-24 7:07 ` Michael Haggerty
2016-03-24 18:56 ` David Turner
2016-03-01 0:52 ` [PATCH v7 10/33] refs: add do_for_each_per_worktree_ref David Turner
2016-03-01 0:52 ` [PATCH v7 11/33] refs: add methods for reflog David Turner
2016-03-01 0:52 ` [PATCH v7 12/33] refs: add method for initial ref transaction commit David Turner
2016-03-01 0:52 ` [PATCH v7 13/33] refs: add method for delete_refs David Turner
2016-03-01 0:52 ` [PATCH v7 14/33] refs: add methods to init refs db David Turner
2016-03-24 7:28 ` Michael Haggerty
2016-03-24 18:04 ` David Turner
2016-03-01 0:52 ` [PATCH v7 15/33] refs: add method to rename refs David Turner
2016-03-01 0:52 ` [PATCH v7 16/33] refs: handle non-normal ref renames David Turner
2016-03-01 0:52 ` [PATCH v7 17/33] refs: make lock generic David Turner
2016-03-24 19:45 ` Michael Haggerty
2016-03-01 0:52 ` [PATCH v7 18/33] refs: move duplicate check to common code David Turner
2016-03-01 0:52 ` [PATCH v7 19/33] refs: allow log-only updates David Turner
2016-04-21 14:17 ` Michael Haggerty
2016-04-25 16:46 ` David Turner
2016-03-01 0:52 ` [PATCH v7 20/33] refs: don't dereference on rename David Turner
2016-03-01 0:52 ` [PATCH v7 21/33] refs: on symref reflog expire, lock symref not referrent David Turner
2016-03-01 0:52 ` [PATCH v7 22/33] refs: resolve symbolic refs first David Turner
2016-03-01 0:52 ` [PATCH v7 23/33] refs: always handle non-normal refs in files backend David Turner
2016-03-01 0:52 ` [PATCH v7 24/33] init: allow alternate ref strorage to be set for new repos David Turner
2016-03-01 0:52 ` [PATCH v7 25/33] refs: check submodules' ref storage config David Turner
2016-03-01 0:52 ` David Turner [this message]
2016-03-01 0:53 ` [PATCH v7 27/33] svn: learn ref-storage argument David Turner
2016-03-01 0:53 ` [PATCH v7 28/33] refs: register ref storage backends David Turner
2016-03-01 0:53 ` [PATCH v7 29/33] setup: configure ref storage on setup David Turner
2016-03-01 8:48 ` Jeff King
2016-03-01 14:50 ` Jeff King
2016-03-01 17:18 ` Ramsay Jones
2016-03-01 19:16 ` David Turner
2016-03-01 0:53 ` [PATCH v7 30/33] refs: break out resolve_ref_unsafe_submodule David Turner
2016-03-01 17:21 ` Ramsay Jones
2016-03-01 19:17 ` David Turner
2016-03-01 0:53 ` [PATCH v7 31/33] refs: add LMDB refs storage backend David Turner
2016-03-01 1:31 ` Duy Nguyen
2016-03-01 1:35 ` David Turner
2016-03-01 1:45 ` Duy Nguyen
2016-03-01 0:53 ` [PATCH v7 32/33] refs: tests for lmdb backend David Turner
2016-03-01 0:53 ` [PATCH v7 33/33] tests: add ref-storage argument David Turner
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456793586-22082-27-git-send-email-dturner@twopensource.com \
--to=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=szeder@ira.uka.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).