strvec: convert remaining callers away from argv_array name

[thirdparty/git.git] / transport-helper.c

diff --git a/transport-helper.c b/transport-helper.c
index 441763fd7cd7552a1f6fbeeb883a542d9b50cc5a..dcd4adf4446309772d02e16e53a4eee001c0732f 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -128,14 +128,14 @@ static struct child_process *get_helper(struct transport *transport)
        helper->in = -1;
        helper->out = -1;
        helper->err = 0;
-       argv_array_pushf(&helper->args, "git-remote-%s", data->name);
-       argv_array_push(&helper->args, transport->remote->name);
-       argv_array_push(&helper->args, remove_ext_force(transport->url));
+       strvec_pushf(&helper->args, "git-remote-%s", data->name);
+       strvec_push(&helper->args, transport->remote->name);
+       strvec_push(&helper->args, remove_ext_force(transport->url));
        helper->git_cmd = 0;
        helper->silent_exec_failure = 1;
 
        if (have_git_dir())
-               argv_array_pushf(&helper->env_array, "%s=%s",
+               strvec_pushf(&helper->env_array, "%s=%s",
                                 GIT_DIR_ENVIRONMENT, get_git_dir());
 
        helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */
@@ -439,13 +439,13 @@ static int get_importer(struct transport *transport, struct child_process *fasti
        int cat_blob_fd, code;
        child_process_init(fastimport);
        fastimport->in = xdup(helper->out);
-       argv_array_push(&fastimport->args, "fast-import");
-       argv_array_push(&fastimport->args, "--allow-unsafe-features");
-       argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
+       strvec_push(&fastimport->args, "fast-import");
+       strvec_push(&fastimport->args, "--allow-unsafe-features");
+       strvec_push(&fastimport->args, debug ? "--stats" : "--quiet");
 
        if (data->bidi_import) {
                cat_blob_fd = xdup(helper->in);
-               argv_array_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd);
+               strvec_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd);
        }
        fastimport->git_cmd = 1;
 
@@ -466,17 +466,17 @@ static int get_exporter(struct transport *transport,
        /* we need to duplicate helper->in because we want to use it after
         * fastexport is done with it. */
        fastexport->out = dup(helper->in);
-       argv_array_push(&fastexport->args, "fast-export");
-       argv_array_push(&fastexport->args, "--use-done-feature");
-       argv_array_push(&fastexport->args, data->signed_tags ?
+       strvec_push(&fastexport->args, "fast-export");
+       strvec_push(&fastexport->args, "--use-done-feature");
+       strvec_push(&fastexport->args, data->signed_tags ?
                "--signed-tags=verbatim" : "--signed-tags=warn-strip");
        if (data->export_marks)
-               argv_array_pushf(&fastexport->args, "--export-marks=%s.tmp", data->export_marks);
+               strvec_pushf(&fastexport->args, "--export-marks=%s.tmp", data->export_marks);
        if (data->import_marks)
-               argv_array_pushf(&fastexport->args, "--import-marks=%s", data->import_marks);
+               strvec_pushf(&fastexport->args, "--import-marks=%s", data->import_marks);
 
        for (i = 0; i < revlist_args->nr; i++)
-               argv_array_push(&fastexport->args, revlist_args->items[i].string);
+               strvec_push(&fastexport->args, revlist_args->items[i].string);
 
        fastexport->git_cmd = 1;
        return start_command(fastexport);
@@ -1082,7 +1082,7 @@ static int has_attribute(const char *attrs, const char *attr)
 }
 
 static struct ref *get_refs_list(struct transport *transport, int for_push,
-                                const struct argv_array *ref_prefixes)
+                                const struct strvec *ref_prefixes)
 {
        get_helper(transport);