[PATCH v5 09/10] submodule--helper init: set submodule.<name>.active
- From
- Brandon Williams <bmwill@google.com>
- Date
- Mar 17, 2017, 22:38 UTC
- Message-ID
- <20170317223805.95271-10-bmwill@google.com>
- In-Reply-To
- <20170317223805.95271-1-bmwill@google.com>
When initializing a submodule set the submodule.<name>.active config to true if the module hasn't already been configured to be active by some other means (e.g. a pathspec set in submodule.active).
Signed-off-by: Brandon Williams <bmwill@google.com> --- builtin/submodule--helper.c | 12 ++++++++++++ t/t7400-submodule-basic.sh | 11 +++++++++++ 2 files changed, 23 insertions(+)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 65208faa7..7700d8948 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -357,6 +357,18 @@ static void init_submodule(const char *path, const char *prefix, int quiet) displaypath); /* + * NEEDSWORK: In a multi-working-tree world, this needs to be + * set in the per-worktree config. + * + * Set active flag for the submodule being initialized + */ + if (!is_submodule_initialized(path)) { + strbuf_reset(&sb); + strbuf_addf(&sb, "submodule.%s.active", sub->name); + git_config_set_gently(sb.buf, "true"); + } + + /* * Copy url setting when it is not set yet. * To look up the url in .git/config, we must not fall back to * .gitmodules, so look it up directly. diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 3af1c00ff..cf77a3a35 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -1256,4 +1256,15 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm test_cmp expect2 actual ' +test_expect_success 'init properly sets the config' ' + test_when_finished "rm -rf multisuper_clone" && + git clone --recurse-submodules="." \ + --recurse-submodules=":(exclude)sub0" \ + multisuper multisuper_clone && + + git -C multisuper_clone submodule init -- sub0 sub1 && + git -C multisuper_clone config --get submodule.sub0.active && + test_must_fail git -C multisuper_clone config --get submodule.sub1.active +' + test_done
-- 2.12.0.367.g23dc2f6d3c-goog