diff options
| author | Brandon Williams <bmwill@google.com> | 2017-03-17 22:38:04 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-18 16:51:23 (GMT) |
| commit | 1f8d711548c08e05766e067dc23e5be3b1b72657 (patch) | |
| tree | a3ffbc67a915610100eaf03cd0ce669cc18d439e | |
| parent | bb62e0a99fcbb9ceb03502bf2168d2e57530214f (diff) | |
| download | git-1f8d711548c08e05766e067dc23e5be3b1b72657.zip git-1f8d711548c08e05766e067dc23e5be3b1b72657.tar.gz git-1f8d711548c08e05766e067dc23e5be3b1b72657.tar.bz2 | |
submodule--helper init: set submodule.<name>.active
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/submodule--helper.c | 12 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 65208fa..7700d89 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 3af1c00..cf77a3a 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 |