From: "Guillaume Galeazzi 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 v2 2/3] submodule--helper.c: add populated to foreach
Date: Sun, 17 May 2020 06:30:22 +0000 [thread overview]
Message-ID: <f9cbdcdeacff3c86a4bce6b43ef105c7aab2fcd3.1589697023.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.631.v2.git.1589697023.gitgitgadget@gmail.com>
From: Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
On a repository with some submodules not initialised, one may need to
run a command only for not initilaised submodule or vice-versa. This
change, add the flag `--[no-]populated` to subcommand `foreach` of `git
submodule--helper`.
Signed-off-by: Guillaume Galeazzi <guillaume.galeazzi@gmail.com>
---
builtin/submodule--helper.c | 14 ++++++++------
t/t7407-submodule-foreach.sh | 15 +++++++++++++++
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4b17e3b3b11..eb17e8c5293 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -451,11 +451,12 @@ struct foreach_cb {
int quiet;
int recursive;
int active_only;
+ int populated_only;
};
#define FOREACH_BOOL_FILTER_NOT_SET -1
-#define FOREACH_CB_INIT { .active_only=FOREACH_BOOL_FILTER_NOT_SET }
+#define FOREACH_CB_INIT { .active_only = FOREACH_BOOL_FILTER_NOT_SET, .populated_only = 1 }
static void runcommand_in_submodule(const struct cache_entry *list_item,
struct foreach_cb *info)
@@ -475,9 +476,6 @@ static void runcommand_in_submodule(const struct cache_entry *list_item,
die(_("No url found for submodule path '%s' in .gitmodules"),
displaypath);
- if (!is_submodule_populated_gently(path, NULL))
- goto cleanup;
-
prepare_submodule_repo_env(&cp.env_array);
/*
@@ -554,7 +552,6 @@ static void runcommand_in_submodule(const struct cache_entry *list_item,
displaypath);
}
-cleanup:
free(displaypath);
}
@@ -571,6 +568,9 @@ static void runcommand_in_submodule_filtered_cb(const struct cache_entry *list_i
return;
}
+ if (info->populated_only != is_submodule_populated_gently(path, NULL))
+ return;
+
runcommand_in_submodule(list_item, info);
}
@@ -586,11 +586,13 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
N_("Recurse into nested submodules")),
OPT_BOOL(0, "active", &info.active_only,
N_("Call command depending on submodule active state")),
+ OPT_BOOL(0, "populated", &info.populated_only,
+ N_("Call command depending on submodule populated state")),
OPT_END()
};
const char *const git_submodule_helper_usage[] = {
- N_("git submodule--helper foreach [--quiet] [--recursive] [--[no-]active] [--] <command>"),
+ N_("git submodule--helper foreach [--quiet] [--recursive] [--[no-]active] [--[no-]populated] [--] <command>"),
NULL
};
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 57c5ae70c8d..be6cd80d464 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -80,6 +80,21 @@ test_expect_success 'test basic "submodule foreach" usage' '
test_i18ncmp expect actual
'
+sub2sha1=$(cd super/sub2 && git rev-parse HEAD)
+
+cat > expect <<EOF
+Entering 'sub2'
+$pwd/clone-foo2-sub2-$sub2sha1
+EOF
+
+test_expect_success 'test "submodule--helper foreach --no-populated" usage' '
+ (
+ cd clone &&
+ git submodule--helper foreach --no-populated "echo \$toplevel-\$name-\$path-\$sha1" > ../actual
+ ) &&
+ test_i18ncmp expect actual
+'
+
cat > expect <<EOF
Entering 'sub3'
$pwd/clone-foo3-sub3-$sub3sha1
--
gitgitgadget
next prev parent reply other threads:[~2020-05-17 6:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 8:26 [PATCH] submodule--helper.c: add only-active to foreach Guillaume G. via GitGitGadget
2020-05-10 16:44 ` 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 ` Guillaume Galeazzi via GitGitGadget [this message]
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=f9cbdcdeacff3c86a4bce6b43ef105c7aab2fcd3.1589697023.git.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).