Merge branch 'ea/blame-use-oideq'

[thirdparty/git.git] / builtin / remote.c

diff --git a/builtin/remote.c b/builtin/remote.c
index e8377994e57a2286f9cea329578c8f104a392b88..542f56e3878b6694e7da6c6141b5e249c511a51e 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -10,7 +10,7 @@
 #include "refs.h"
 #include "refspec.h"
 #include "object-store.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 
 static const char * const builtin_remote_usage[] = {
@@ -478,6 +478,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
        struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
        struct refspec_item refspec;
 
+       memset(&refspec, 0, sizeof(refspec));
        refspec.force = 0;
        refspec.pattern = 1;
        refspec.src = refspec.dst = "refs/heads/*";
@@ -1451,35 +1452,35 @@ static int update(int argc, const char **argv)
                         N_("prune remotes after fetching")),
                OPT_END()
        };
-       struct argv_array fetch_argv = ARGV_ARRAY_INIT;
+       struct strvec fetch_argv = STRVEC_INIT;
        int default_defined = 0;
        int retval;
 
        argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
                             PARSE_OPT_KEEP_ARGV0);
 
-       argv_array_push(&fetch_argv, "fetch");
+       strvec_push(&fetch_argv, "fetch");
 
        if (prune != -1)
-               argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune");
+               strvec_push(&fetch_argv, prune ? "--prune" : "--no-prune");
        if (verbose)
-               argv_array_push(&fetch_argv, "-v");
-       argv_array_push(&fetch_argv, "--multiple");
+               strvec_push(&fetch_argv, "-v");
+       strvec_push(&fetch_argv, "--multiple");
        if (argc < 2)
-               argv_array_push(&fetch_argv, "default");
+               strvec_push(&fetch_argv, "default");
        for (i = 1; i < argc; i++)
-               argv_array_push(&fetch_argv, argv[i]);
+               strvec_push(&fetch_argv, argv[i]);
 
-       if (strcmp(fetch_argv.argv[fetch_argv.argc-1], "default") == 0) {
+       if (strcmp(fetch_argv.v[fetch_argv.nr-1], "default") == 0) {
                git_config(get_remote_default, &default_defined);
                if (!default_defined) {
-                       argv_array_pop(&fetch_argv);
-                       argv_array_push(&fetch_argv, "--all");
+                       strvec_pop(&fetch_argv);
+                       strvec_push(&fetch_argv, "--all");
                }
        }
 
-       retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD);
-       argv_array_clear(&fetch_argv);
+       retval = run_command_v_opt(fetch_argv.v, RUN_GIT_CMD);
+       strvec_clear(&fetch_argv);
        return retval;
 }