From: Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
On repository with some submodule not active, it could be needed to run a command only for active submodule. Today it can be achived with the command:
git submodule foreach 'git -C $toplevel submodule--helper is-active \ $sm_path && pwd || :'
Goal of this change is to make it more accessible by adding the flag --only-active to the submodule--helper command. Previous example become:
git submodule--helper foreach --only-active pwd
Signed-off-by: Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
---
submodule--helper.c: add only-active to foreach
On repository with some submodule not active, it could be needed to run
a command only for active submodule. Today it can be achived with the
command:
git submodule foreach 'git -C $toplevel submodule--helper is-active
$sm_path && pwd || :'
Goal of this change is to make it more accessible by adding the flag
--only-active to the submodule--helper command. Previous example become:
git submodule--helper foreach --only-active pwd
Signed-off-by: Guillaume Galeazzi guillaume.galeazzi@gmail.com
[guillaume.galeazzi@gmail.com]Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-631%2Fgzzi%2Fsubmodule-only-active-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-631/gzzi/submodule-only-active-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/631
builtin/submodule--helper.c | 8 +++++++- t/t7407-submodule-foreach.sh | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-)
Show changes to 2 files +23 −1
builtin/submodule--helper.c, t/t7407-submodule-foreach.sh
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 1a4b391c882..1a275403764 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -450,6 +450,7 @@ struct foreach_cb { const char *prefix; int quiet; int recursive; + int only_active; }; #define FOREACH_CB_INIT { 0 } @@ -464,6 +465,9 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, struct child_process cp = CHILD_PROCESS_INIT; char *displaypath; + if (info->only_active && !is_submodule_active(the_repository, path)) + return; + displaypath = get_submodule_displaypath(path, info->prefix); sub = submodule_from_path(the_repository, &null_oid, path); @@ -565,11 +569,13 @@ static int module_foreach(int argc, const char **argv, const char *prefix) OPT__QUIET(&info.quiet, N_("Suppress output of entering each submodule command")), OPT_BOOL(0, "recursive", &info.recursive, N_("Recurse into nested submodules")), + OPT_BOOL(0, "only-active", &info.only_active, + N_("Call command only for active submodules")), OPT_END() }; const char *const git_submodule_helper_usage[] = { - N_("git submodule--helper foreach [--quiet] [--recursive] [--] <command>"), + N_("git submodule--helper foreach [--quiet] [--recursive] [--only-active] [--] <command>"), NULL }; diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh index 6b2aa917e11..f90a16e3e67 100755 --- a/t/t7407-submodule-foreach.sh +++ b/t/t7407-submodule-foreach.sh @@ -80,6 +80,22 @@ test_expect_success 'test basic "submodule foreach" usage' ' test_i18ncmp expect actual ' +sub3sha1=$(cd super/sub3 && git rev-parse HEAD) +cat > expect <<EOF +Entering 'sub3' +$pwd/clone-foo3-sub3-$sub3sha1 +EOF + +test_expect_success 'test "submodule--helper foreach --only-active" usage' ' + test_when_finished "git -C clone config --unset submodule.foo1.active" && + ( + cd clone && + git config --bool submodule.foo1.active "false" && + git submodule--helper foreach --only-active "echo \$toplevel-\$name-\$path-\$sha1" > ../actual + ) && + test_i18ncmp expect actual +' + cat >expect <<EOF Entering '../sub1' $pwd/clone-foo1-sub1-../sub1-$sub1sha1 base-commit: b994622632154fc3b17fb40a38819ad954a5fb88
-- gitgitgadget
