From: Brandon Williams <bmwill@google.com>
To: git@vger.kernel.org
Cc: Brandon Williams <bmwill@google.com>,
sbeller@google.com, gitster@pobox.com
Subject: [PATCH v5 10/10] submodule add: respect submodule.active and submodule.<name>.active
Date: Fri, 17 Mar 2017 15:38:05 -0700 [thread overview]
Message-ID: <20170317223805.95271-11-bmwill@google.com> (raw)
In-Reply-To: <20170317223805.95271-1-bmwill@google.com>
In addition to adding submodule.<name>.url to the config, set
submodule.<name>.active to true unless submodule.active is configured
and the submodule's path matches the configured pathspec.
Signed-off-by: Brandon Williams <bmwill@google.com>
---
git-submodule.sh | 14 ++++++++++++++
t/t7413-submodule-is-active.sh | 21 +++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/git-submodule.sh b/git-submodule.sh
index db94dea3b..6ec35e5fc 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -278,6 +278,20 @@ or you are unsure what this means choose another name with the '--name' option."
fi &&
git add --force .gitmodules ||
die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
+
+ # NEEDSWORK: In a multi-working-tree world, this needs to be
+ # set in the per-worktree config.
+ if git config --get submodule.active >/dev/null
+ then
+ # If the submodule being adding isn't already covered by the
+ # current configured pathspec, set the submodule's active flag
+ if ! git submodule--helper is-active "$sm_path"
+ then
+ git config submodule."$sm_name".active "true"
+ fi
+ else
+ git config submodule."$sm_name".active "true"
+ fi
}
#
diff --git a/t/t7413-submodule-is-active.sh b/t/t7413-submodule-is-active.sh
index ea1644b58..9c785b07e 100755
--- a/t/t7413-submodule-is-active.sh
+++ b/t/t7413-submodule-is-active.sh
@@ -15,6 +15,12 @@ test_expect_success 'setup' '
test_commit -C super initial &&
git -C super submodule add ../sub sub1 &&
git -C super submodule add ../sub sub2 &&
+
+ # Remove submodule.<name>.active entries in order to test in an
+ # environment where only URLs are present in the conifg
+ git -C super config --unset submodule.sub1.active &&
+ git -C super config --unset submodule.sub2.active &&
+
git -C super commit -a -m "add 2 submodules at sub{1,2}"
'
@@ -83,4 +89,19 @@ test_expect_success 'is-active with submodule.active and submodule.<name>.active
git -C super submodule--helper is-active sub2
'
+test_expect_success 'is-active, submodule.active and submodule add' '
+ test_when_finished "rm -rf super2" &&
+ git init super2 &&
+ test_commit -C super2 initial &&
+ git -C super2 config --add submodule.active "sub*" &&
+
+ # submodule add should only add submodule.<name>.active
+ # to the config if not matched by the pathspec
+ git -C super2 submodule add ../sub sub1 &&
+ test_must_fail git -C super2 config --get submodule.sub1.active &&
+
+ git -C super2 submodule add ../sub mod &&
+ git -C super2 config --get submodule.mod.active
+'
+
test_done
--
2.12.0.367.g23dc2f6d3c-goog
next prev parent reply other threads:[~2017-03-18 1:21 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 23:47 [PATCH 00/10] decoupling a submodule's existence and its url Brandon Williams
2017-02-23 23:47 ` [PATCH 01/10] submodule: decouple url and submodule existence Brandon Williams
2017-02-24 21:02 ` Junio C Hamano
2017-03-01 20:02 ` Brandon Williams
2017-03-01 21:53 ` Stefan Beller
2017-03-06 18:50 ` Brandon Williams
2017-03-02 5:43 ` Junio C Hamano
2017-02-23 23:47 ` [PATCH 02/10] submodule update: add `--init-active` switch Brandon Williams
2017-02-23 23:47 ` [PATCH 03/10] clone: add --submodule-spec=<pathspec> switch Brandon Williams
2017-02-23 23:47 ` [PATCH 04/10] completion: clone can initialize specific submodules Brandon Williams
2017-02-23 23:47 ` [PATCH 05/10] submodule--helper: add is_active command Brandon Williams
2017-02-24 1:15 ` Stefan Beller
2017-02-27 18:35 ` Brandon Williams
2017-02-23 23:47 ` [PATCH 06/10] submodule add: respect submodule.active Brandon Williams
2017-02-23 23:47 ` [PATCH 07/10] submodule status: use submodule--helper is-active Brandon Williams
2017-02-23 23:47 ` [PATCH 08/10] submodule deinit: use most reliable url Brandon Williams
2017-02-23 23:47 ` [PATCH 09/10] submodule sync: use submodule--helper is-active Brandon Williams
2017-02-23 23:47 ` [PATCH 10/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-02-24 0:58 ` Stefan Beller
2017-02-27 18:38 ` Brandon Williams
2017-02-23 23:58 ` [PATCH 00/10] decoupling a submodule's existence and its url Stefan Beller
2017-03-09 1:23 ` [PATCH v2 00/11] " Brandon Williams
2017-03-09 1:23 ` [PATCH v2 01/11] submodule--helper: add is_active command Brandon Williams
2017-03-09 1:23 ` [PATCH v2 02/11] submodule status: use submodule--helper is-active Brandon Williams
2017-03-09 1:23 ` [PATCH v2 03/11] submodule deinit: use most reliable url Brandon Williams
2017-03-09 1:56 ` Stefan Beller
2017-03-09 18:15 ` Brandon Williams
2017-03-09 1:23 ` [PATCH v2 04/11] submodule sync: use submodule--helper is-active Brandon Williams
2017-03-09 1:23 ` [PATCH v2 05/11] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-09 1:23 ` [PATCH v2 06/11] submodule: decouple url and submodule existence Brandon Williams
2017-03-09 1:23 ` [PATCH v2 07/11] submodule update: add `--init-active` switch Brandon Williams
2017-03-09 2:16 ` Stefan Beller
2017-03-09 18:08 ` Brandon Williams
2017-03-09 1:23 ` [PATCH v2 08/11] clone: add --submodule-spec=<pathspec> switch Brandon Williams
2017-03-09 1:23 ` [PATCH v2 09/11] completion: clone can initialize specific submodules Brandon Williams
2017-03-09 1:23 ` [PATCH v2 10/11] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-09 2:28 ` Stefan Beller
2017-03-09 17:56 ` Brandon Williams
2017-03-09 1:23 ` [PATCH v2 11/11] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-13 21:43 ` [PATCH v3 00/10] decoupling a submodule's existence and its url Brandon Williams
2017-03-13 21:43 ` [PATCH v3 01/10] submodule--helper: add is_active command Brandon Williams
2017-03-13 22:36 ` Stefan Beller
2017-03-14 17:40 ` Junio C Hamano
2017-03-14 22:44 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 02/10] submodule status: use submodule--helper is-active Brandon Williams
2017-03-14 17:46 ` Junio C Hamano
2017-03-14 18:16 ` Stefan Beller
2017-03-14 20:20 ` Junio C Hamano
2017-03-14 21:33 ` Junio C Hamano
2017-03-14 22:50 ` Brandon Williams
2017-03-14 23:36 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 03/10] submodule sync: " Brandon Williams
2017-03-14 17:53 ` Junio C Hamano
2017-03-14 23:50 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 04/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-14 18:06 ` Junio C Hamano
2017-03-14 18:40 ` Stefan Beller
2017-03-14 20:25 ` Junio C Hamano
2017-03-15 0:10 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 05/10] submodule: decouple url and submodule existence Brandon Williams
2017-03-13 22:49 ` Stefan Beller
2017-03-15 17:38 ` Brandon Williams
2017-03-14 18:42 ` Junio C Hamano
2017-03-14 21:38 ` Junio C Hamano
2017-03-15 21:37 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 06/10] submodule update: add `--init-active` switch Brandon Williams
2017-03-14 19:18 ` Junio C Hamano
2017-03-15 21:52 ` Brandon Williams
2017-03-14 19:28 ` Junio C Hamano
2017-03-15 21:42 ` Brandon Williams
2017-03-13 21:43 ` [PATCH v3 07/10] clone: add --submodule-spec=<pathspec> switch Brandon Williams
2017-03-14 19:38 ` Junio C Hamano
2017-03-15 23:08 ` Brandon Williams
2017-03-15 23:25 ` Stefan Beller
2017-03-13 21:43 ` [PATCH v3 08/10] completion: clone can initialize specific submodules Brandon Williams
2017-03-13 21:43 ` [PATCH v3 09/10] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-14 19:43 ` Junio C Hamano
2017-03-15 22:46 ` Brandon Williams
2017-03-16 16:47 ` Junio C Hamano
2017-03-13 21:43 ` [PATCH v3 10/10] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-14 19:48 ` Junio C Hamano
2017-03-15 21:59 ` Brandon Williams
2017-03-13 22:51 ` [PATCH v3 00/10] decoupling a submodule's existence and its url Stefan Beller
2017-03-14 21:40 ` Junio C Hamano
2017-03-14 22:17 ` Brandon Williams
2017-03-16 22:29 ` [PATCH v4 00/10] decoupling url and submodule interest Brandon Williams
2017-03-16 22:29 ` [PATCH v4 01/10] submodule--helper: add is-active subcommand Brandon Williams
2017-03-16 22:29 ` [PATCH v4 02/10] submodule status: use submodule--helper is-active Brandon Williams
2017-03-16 22:29 ` [PATCH v4 03/10] submodule sync: skip work for inactive submodules Brandon Williams
2017-03-16 23:24 ` Stefan Beller
2017-03-16 23:25 ` Stefan Beller
2017-03-16 23:26 ` Brandon Williams
2017-03-17 5:26 ` Junio C Hamano
2017-03-17 6:58 ` Brandon Williams
2017-03-17 17:28 ` Junio C Hamano
2017-03-16 22:29 ` [PATCH v4 04/10] submodule sync: use submodule--helper is-active Brandon Williams
2017-03-16 22:29 ` [PATCH v4 05/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-16 22:29 ` [PATCH v4 06/10] submodule: decouple url and submodule interest Brandon Williams
2017-03-16 23:45 ` Stefan Beller
2017-03-16 22:29 ` [PATCH v4 07/10] submodule init: initialize active submodules Brandon Williams
2017-03-17 18:17 ` Stefan Beller
2017-03-17 22:28 ` Brandon Williams
2017-03-17 23:25 ` Stefan Beller
2017-03-16 22:29 ` [PATCH v4 08/10] clone: teach --recurse-submodules to optionally take a pathspec Brandon Williams
2017-03-17 17:37 ` Stefan Beller
2017-03-17 21:28 ` Brandon Williams
2017-03-16 22:29 ` [PATCH v4 09/10] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-17 17:22 ` Stefan Beller
2017-03-17 21:55 ` Brandon Williams
2017-03-16 22:29 ` [PATCH v4 10/10] submodule add: respect submodule.active and submodule.<name>.active Brandon Williams
2017-03-17 22:37 ` [PATCH v5 00/10] decoupling url and submodule interest Brandon Williams
2017-03-17 22:37 ` [PATCH v5 01/10] submodule--helper: add is-active subcommand Brandon Williams
2017-03-17 22:37 ` [PATCH v5 02/10] submodule status: use submodule--helper is-active Brandon Williams
2017-03-17 22:37 ` [PATCH v5 03/10] submodule sync: skip work for inactive submodules Brandon Williams
2017-03-17 22:37 ` [PATCH v5 04/10] submodule sync: use submodule--helper is-active Brandon Williams
2017-03-17 22:38 ` [PATCH v5 05/10] submodule--helper clone: check for configured submodules using helper Brandon Williams
2017-03-17 22:38 ` [PATCH v5 06/10] submodule: decouple url and submodule interest Brandon Williams
2017-03-17 22:38 ` [PATCH v5 07/10] submodule init: initialize active submodules Brandon Williams
2017-03-17 22:38 ` [PATCH v5 08/10] clone: teach --recurse-submodules to optionally take a pathspec Brandon Williams
2017-03-17 22:38 ` [PATCH v5 09/10] submodule--helper init: set submodule.<name>.active Brandon Williams
2017-03-17 22:38 ` Brandon Williams [this message]
2017-03-17 23:25 ` [PATCH v5 00/10] decoupling url and submodule interest Stefan Beller
2017-03-18 17:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170317223805.95271-11-bmwill@google.com \
--to=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).