From: "Guillaume G. via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Guillaume G." <guillaume.galeazzi@gmail.com>,
Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
Subject: [PATCH] submodule--helper.c: add only-active to foreach
Date: Sun, 10 May 2020 08:26:02 +0000 [thread overview]
Message-ID: <pull.631.git.1589099162707.gitgitgadget@gmail.com> (raw)
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(-)
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
next reply other threads:[~2020-05-10 8:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 8:26 Guillaume G. via GitGitGadget [this message]
2020-05-10 16:44 ` [PATCH] submodule--helper.c: add only-active to foreach Shourya Shukla
2020-05-10 21:51 ` Guillaume Galeazzi
2020-05-10 22:42 ` Eric Sunshine
2020-05-15 16:29 ` Guillaume Galeazzi
2020-05-12 14:15 ` Shourya Shukla
2020-05-15 16:51 ` Guillaume Galeazzi
2020-05-15 17:03 ` Junio C Hamano
2020-05-15 18:53 ` Guillaume Galeazzi
2020-05-12 18:53 ` Junio C Hamano
2020-05-13 5:17 ` Guillaume Galeazzi
2020-05-13 15:35 ` Junio C Hamano
2020-05-13 20:07 ` Guillaume Galeazzi
2020-05-13 20:35 ` Junio C Hamano
2020-05-15 11:04 ` Guillaume Galeazzi
2020-05-17 6:30 ` [PATCH v2 0/3] " Guillaume G. via GitGitGadget
2020-05-17 6:30 ` [PATCH v2 1/3] submodule--helper.c: add active " Guillaume Galeazzi via GitGitGadget
2020-05-17 6:30 ` [PATCH v2 2/3] submodule--helper.c: add populated " Guillaume Galeazzi via GitGitGadget
2020-05-17 6:30 ` [PATCH v2 3/3] submodule--helper.c: add branch " Guillaume Galeazzi via GitGitGadget
2020-05-17 15:46 ` [PATCH v2 0/3] submodule--helper.c: add only-active " Junio C Hamano
2020-05-17 19:47 ` Guillaume Galeazzi
2020-08-18 15:57 ` Guillaume Galeazzi
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=pull.631.git.1589099162707.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=guillaume.galeazzi@gmail.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).