get_importer: use run-command's internal argv_array

This saves a few lines and lets us avoid having to clean up
the memory manually when the command finishes.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/transport-helper.c b/transport-helper.c
index 9f8f3b12643102178198c7d9a3b5c8e8206e45ce..d9063d714591bad2e44a4e58fdffc3bb1708157d 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -394,18 +394,16 @@ static int get_importer(struct transport *transport, struct child_process *fasti
 {
        struct child_process *helper = get_helper(transport);
        struct helper_data *data = transport->data;
 {
        struct child_process *helper = get_helper(transport);
        struct helper_data *data = transport->data;

-       struct argv_array argv = ARGV_ARRAY_INIT;

        int cat_blob_fd, code;
        memset(fastimport, 0, sizeof(*fastimport));
        fastimport->in = helper->out;
        int cat_blob_fd, code;
        memset(fastimport, 0, sizeof(*fastimport));
        fastimport->in = helper->out;

-       argv_array_push(&argv, "fast-import");
-       argv_array_push(&argv, debug ? "--stats" : "--quiet");
+       argv_array_push(&fastimport->args, "fast-import");
+       argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");

 
        if (data->bidi_import) {
                cat_blob_fd = xdup(helper->in);
 
        if (data->bidi_import) {
                cat_blob_fd = xdup(helper->in);

-               argv_array_pushf(&argv, "--cat-blob-fd=%d", cat_blob_fd);
+               argv_array_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd);

        }
        }

-       fastimport->argv = argv.argv;

        fastimport->git_cmd = 1;
 
        code = start_command(fastimport);
        fastimport->git_cmd = 1;
 
        code = start_command(fastimport);


@@ -476,7 +474,6 @@ static int fetch_with_import(struct transport *transport,
 
        if (finish_command(&fastimport))
                die("Error while running fast-import");
 
        if (finish_command(&fastimport))
                die("Error while running fast-import");

-       argv_array_free_detached(fastimport.argv);

 
        /*
         * The fast-import stream of a remote helper that advertises
 
        /*
         * The fast-import stream of a remote helper that advertises