submodule--helper: use strvec_pushf() for --super-prefix

Use the strvec_pushf() call that already appends a slash to also produce
the stuck form of the option --super-prefix instead of adding the option
name in a separate call of strvec_push() or strvec_pushl().  This way we
can more easily see that these parts make up a single option with its
argument and save a function call.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 5a71b1ee7ef5d0aa0f883a40b3f96c3da7e95cac..cb9bd05a55f1a6a804e95da9e20dd0d00249090c 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -379,8 +379,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");
@@ -704,8 +703,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");
@@ -1305,9 +1303,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");
@@ -2533,10 +2529,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");