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 | 5 +++++ builtin/clone.c | 5 +++++ builtin/submodule--helper.c | 2 +- git-submodule.sh | 13 +++++++++++++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index cb7966a..ffaf5b0 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>] @@ -225,6 +226,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 dd26f57..a4c6396 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -95,6 +95,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() }; @@ -733,6 +735,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 8002187..849da47 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 10c5af9..022902b 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" @@ -670,6 +678,11 @@ cmd_update() if test -n "$init" then cmd_init "--" "$@" || return + else + if test -n "$ref_storage" + then + usage + fi fi git submodule--helper update-clone ${GIT_QUIET:+--quiet} \ -- 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