development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 14:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/simplify-submodule-helper-super-prefix-invocation'

Browse source 
Code clean-up.

* rs/simplify-submodule-helper-super-prefix-invocation:
  submodule--helper: use strvec_pushf() for --super-prefix
This commit is contained in:
Junio C Hamano 2024-07-12 08:41:57 -07:00
parent 7c01dcd018 4b837f821e
commit e6ae4d6efe
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
builtin/submodule--helper.c
View file

@ -376,8 +376,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
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, "--super-prefix=%s/", displaypath);
strvec_pushf(&cpr.args, "%s/", displaypath);
if (info->quiet) if (info->quiet)
strvec_push(&cpr.args, "--quiet"); strvec_push(&cpr.args, "--quiet");
@ -702,8 +701,7 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
strvec_pushl(&cpr.args, "submodule--helper", "status", strvec_pushl(&cpr.args, "submodule--helper", "status",
"--recursive", NULL); "--recursive", NULL);
strvec_push(&cpr.args, "--super-prefix"); strvec_pushf(&cpr.args, "--super-prefix=%s/", displaypath);
strvec_pushf(&cpr.args, "%s/", displaypath);
if (flags & OPT_CACHED) if (flags & OPT_CACHED)
strvec_push(&cpr.args, "--cached"); strvec_push(&cpr.args, "--cached");
@ -1304,9 +1302,7 @@ static void sync_submodule(const char *path, const char *prefix,
strvec_pushl(&cpr.args, "submodule--helper", "sync", strvec_pushl(&cpr.args, "submodule--helper", "sync",
"--recursive", NULL); "--recursive", NULL);
strvec_push(&cpr.args, "--super-prefix"); strvec_pushf(&cpr.args, "--super-prefix=%s/", displaypath);
strvec_pushf(&cpr.args, "%s/", displaypath);
if (flags & OPT_QUIET) if (flags & OPT_QUIET)
strvec_push(&cpr.args, "--quiet"); strvec_push(&cpr.args, "--quiet");
@ -2534,10 +2530,9 @@ static void update_data_to_args(const struct update_data *update_data,
enum submodule_update_type update_type = update_data->update_default; enum submodule_update_type update_type = update_data->update_default;
strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL); strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL);
if (update_data->displaypath) { if (update_data->displaypath)
strvec_push(args, "--super-prefix"); strvec_pushf(args, "--super-prefix=%s/",
strvec_pushf(args, "%s/", update_data->displaypath); update_data->displaypath);
}
strvec_pushf(args, "--jobs=%d", update_data->max_jobs); strvec_pushf(args, "--jobs=%d", update_data->max_jobs);
if (update_data->quiet) if (update_data->quiet)
strvec_push(args, "--quiet"); strvec_push(args, "--quiet");