[PATCH] SQUASH
From: Stefan Beller <hidden>
Date: 2016-11-22 19:34:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Stefan Beller <redacted> --- On Tue, Nov 22, 2016 at 11:22 AM, Stefan Beller [off-list ref] wrote:
When a submodule has its git dir inside the working dir, the submodule support for checkout that we plan to add in a later patch will fail. Add functionality to migrate the git directory to be embedded into the superprojects git directory.
I spoke too early, this needs to be squashed. :( Stefan builtin/submodule--helper.c | 3 +++ git-submodule.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index e94dd68a0e..75cdbf45b8 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c@@ -1083,6 +1083,9 @@ static int embed_git_dir(int argc, const char **argv, const char *prefix) struct module_list list = MODULE_LIST_INIT; struct option embed_gitdir_options[] = { + OPT_STRING(0, "prefix", &prefix, + N_("path"), + N_("path into the working tree")), OPT_END() };
diff --git a/git-submodule.sh b/git-submodule.sh
index 2178248287..b7e124f340 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh@@ -1133,7 +1133,7 @@ cmd_sync() cmd_embedgitdirs() { - git submodule--helper --prefix "$wt_prefix" embed-git-dirs "$@" + git submodule--helper embed-git-dirs --prefix "$wt_prefix" "$@" } # This loop parses the command line arguments to find the
--
2.11.0.rc2.4.g3396b6f.dirty