mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule--helper: convert "foreach" to its own "--super-prefix"

Browse Source 
As with a preceding commit to convert "absorbgitdirs", we can convert
"submodule--helper foreach" to use its own "--super-prefix", instead
of relying on the global "--super-prefix" argument to "git"
itself. See that earlier commit for the rationale and background.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2022-12-20 13:39:52 +01:00
committed by Junio C Hamano
parent bb61a962d2
commit 677c981260
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/submodule--helper.c
View File

@ -278,6 +278,7 @@ struct foreach_cb {
int argc; int argc;
const char **argv; const char **argv;
const char *prefix; const char *prefix;
const char *super_prefix;
int quiet; int quiet;
int recursive; int recursive;
}; };
@ -294,7 +295,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
char *displaypath; char *displaypath;
displaypath = get_submodule_displaypath(path, info->prefix, displaypath = get_submodule_displaypath(path, info->prefix,
get_super_prefix()); info->super_prefix);
sub = submodule_from_path(the_repository, null_oid(), path); sub = submodule_from_path(the_repository, null_oid(), path);
@ -364,10 +365,10 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
cpr.dir = path; cpr.dir = path;
prepare_submodule_repo_env(&cpr.env); prepare_submodule_repo_env(&cpr.env);
strvec_pushl(&cpr.args, "--super-prefix", NULL);
strvec_pushf(&cpr.args, "%s/", displaypath);
strvec_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive", strvec_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive",
NULL); NULL);
strvec_pushl(&cpr.args, "--super-prefix", NULL);
strvec_pushf(&cpr.args, "%s/", displaypath);
if (info->quiet) if (info->quiet)
strvec_push(&cpr.args, "--quiet"); strvec_push(&cpr.args, "--quiet");
@ -391,6 +392,7 @@ static int module_foreach(int argc, const char **argv, const char *prefix)
struct pathspec pathspec = { 0 }; struct pathspec pathspec = { 0 };
struct module_list list = MODULE_LIST_INIT; struct module_list list = MODULE_LIST_INIT;
struct option module_foreach_options[] = { struct option module_foreach_options[] = {
OPT__SUPER_PREFIX(&info.super_prefix),
OPT__QUIET(&info.quiet, N_("suppress output of entering each submodule command")), OPT__QUIET(&info.quiet, N_("suppress output of entering each submodule command")),
OPT_BOOL(0, "recursive", &info.recursive, OPT_BOOL(0, "recursive", &info.recursive,
N_("recurse into nested submodules")), N_("recurse into nested submodules")),
@ -3390,8 +3392,8 @@ int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
subcmd = argv[0]; subcmd = argv[0];
if (strcmp(subcmd, "clone") && strcmp(subcmd, "update") && if (strcmp(subcmd, "clone") && strcmp(subcmd, "update") &&
strcmp(subcmd, "foreach") && strcmp(subcmd, "status") && strcmp(subcmd, "status") && strcmp(subcmd, "sync") &&
strcmp(subcmd, "sync") && get_super_prefix()) get_super_prefix())
/* /*
* xstrfmt() rather than "%s %s" to keep the translated * xstrfmt() rather than "%s %s" to keep the translated
* string identical to git.c's. * string identical to git.c's.