diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-12 08:41:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-12 08:41:58 -0700 |
| commit | e6ae4d6efe8c755e0e6f5508acbf3bc7e2dbc935 (patch) | |
| tree | 114d78790471ccdabd79e54d0a0ac11fd2648d74 | |
| parent | Merge branch 'as/pathspec-h-typofix' (diff) | |
| parent | submodule--helper: use strvec_pushf() for --super-prefix (diff) | |
| download | git-e6ae4d6efe8c755e0e6f5508acbf3bc7e2dbc935.tar.gz git-e6ae4d6efe8c755e0e6f5508acbf3bc7e2dbc935.zip | |
Merge branch 'rs/simplify-submodule-helper-super-prefix-invocation'
Code clean-up.
* rs/simplify-submodule-helper-super-prefix-invocation:
submodule--helper: use strvec_pushf() for --super-prefix
| -rw-r--r-- | builtin/submodule--helper.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 880ab4456e..f1218a1995 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -376,8 +376,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item, strvec_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive", NULL); - strvec_pushl(&cpr.args, "--super-prefix", NULL); - strvec_pushf(&cpr.args, "%s/", displaypath); + strvec_pushf(&cpr.args, "--super-prefix=%s/", displaypath); if (info->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", "--recursive", NULL); - strvec_push(&cpr.args, "--super-prefix"); - strvec_pushf(&cpr.args, "%s/", displaypath); + strvec_pushf(&cpr.args, "--super-prefix=%s/", displaypath); if (flags & OPT_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", "--recursive", NULL); - strvec_push(&cpr.args, "--super-prefix"); - strvec_pushf(&cpr.args, "%s/", displaypath); - + strvec_pushf(&cpr.args, "--super-prefix=%s/", displaypath); if (flags & OPT_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; strvec_pushl(args, "submodule--helper", "update", "--recursive", NULL); - if (update_data->displaypath) { - strvec_push(args, "--super-prefix"); - strvec_pushf(args, "%s/", update_data->displaypath); - } + if (update_data->displaypath) + strvec_pushf(args, "--super-prefix=%s/", + update_data->displaypath); strvec_pushf(args, "--jobs=%d", update_data->max_jobs); if (update_data->quiet) strvec_push(args, "--quiet"); |