Add a new option, --ref-storage, 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 --ref-storage option option when cloning submodules. Signed-off-by: David Turner <dturner@xxxxxxxxxxxxxxxx> --- Documentation/git-clone.txt | 4 ++++ builtin/clone.c | 5 +++++ builtin/submodule--helper.c | 2 +- git-submodule.sh | 13 +++++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 6bf000d..dde2a77 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] [--] <repository> [<directory>] @@ -221,6 +222,9 @@ objects from the source repository into a pack in the cloned repository. The result is Git repository can be separated from working tree. +--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 diff --git a/builtin/clone.c b/builtin/clone.c index 53c2834..377e59a 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -92,6 +92,8 @@ 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, "ref-storage", &ref_storage_backend, + N_("name"), N_("name of backend type to use")), OPT_END() }; @@ -726,6 +728,9 @@ static int checkout(void) cmd.git_cmd = 1; argv_array_pushl(&cmd.args, "submodule", "update", "--init", "--recursive", NULL); + argv_array_pushl(&cmd.args, "--ref-storage", + ref_storage_backend, NULL); + err = run_command(&cmd); } diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index f4c3eff..a411332 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -140,7 +140,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/git-submodule.sh b/git-submodule.sh index 9bc5c5f..d8a9192 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -637,6 +637,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" @@ -662,6 +670,11 @@ cmd_update() if test -n "$init" then cmd_init "--" "$@" || return + else + if test -n "$ref_storage" + then + usage + fi fi cloned_modules= -- 2.4.2.749.g730654d-twtrsrc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html