strvec: rename struct fields

The "argc" and "argv" names made sense when the struct was argv_array,
but now they're just confusing. Let's rename them to "nr" (which we use
for counts elsewhere) and "v" (which is rather terse, but reads well
when combined with typical variable names like "args.v").

Note that we have to update all of the callers immediately. Playing
tricks with the preprocessor is hard here, because we wouldn't want to
rewrite unrelated tokens.

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

diff --git a/add-interactive.c b/add-interactive.c
index 458f3a3e69f827213422250b4bdf1fb635137dee..555c4abf324f553b6bb70f6640554d407c12677a 100644 (file)
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -944,7 +944,7 @@ static int run_patch(struct add_i_state *s, const struct pathspec *ps,
                                            files->items.items[i].string);
                parse_pathspec(&ps_selected,
                               PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
-                              PATHSPEC_LITERAL_PATH, "", args.argv);
+                              PATHSPEC_LITERAL_PATH, "", args.v);
                res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
                strvec_clear(&args);
                clear_pathspec(&ps_selected);
@@ -986,7 +986,7 @@ static int run_diff(struct add_i_state *s, const struct pathspec *ps,
                        if (files->selected[i])
                                strvec_push(&args,
                                            files->items.items[i].string);
-               res = run_command_v_opt(args.argv, 0);
+               res = run_command_v_opt(args.v, 0);
                strvec_clear(&args);
        }
 

diff --git a/add-patch.c b/add-patch.c
index 8c0772803b10b01dfca4aaf64e726a9740acf78e..0f68eb665eb1c68bc09802eae82d3d47a666d653 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -391,14 +391,14 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
                            get_oid("HEAD", &oid) ?
                            empty_tree_oid_hex() : s->revision);
        }
-       color_arg_index = args.argc;
+       color_arg_index = args.nr;
        /* Use `--no-color` explicitly, just in case `diff.color = always`. */
        strvec_pushl(&args, "--no-color", "-p", "--", NULL);
        for (i = 0; i < ps->nr; i++)
                strvec_push(&args, ps->items[i].original);
 
        setup_child_process(s, &cp, NULL);
-       cp.argv = args.argv;
+       cp.argv = args.v;
        res = capture_command(&cp, plain, 0);
        if (res) {
                strvec_clear(&args);
@@ -415,8 +415,8 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
                const char *diff_filter = s->s.interactive_diff_filter;
 
                setup_child_process(s, &colored_cp, NULL);
-               xsnprintf((char *)args.argv[color_arg_index], 8, "--color");
-               colored_cp.argv = args.argv;
+               xsnprintf((char *)args.v[color_arg_index], 8, "--color");
+               colored_cp.argv = args.v;
                colored = &s->colored;
                res = capture_command(&colored_cp, colored, 0);
                strvec_clear(&args);

diff --git a/bisect.c b/bisect.c
index 99ff694960725ee59abb3c90ad51075319c0d804..6959fb8aad932e2c4e537874883f4003b59ccbbd 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -649,7 +649,7 @@ static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
        if (read_paths)
                read_bisect_paths(&rev_argv);
 
-       setup_revisions(rev_argv.argc, rev_argv.argv, revs, NULL);
+       setup_revisions(rev_argv.nr, rev_argv.v, revs, NULL);
        /* XXX leak rev_argv, as "revs" may still be pointing to it */
 }
 

diff --git a/builtin/add.c b/builtin/add.c
index 6185dd12a80a7192212fb30e6eff86b1d917972d..ab39a60a0d69e0cd1aa4f7be4166c74af9c49887 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -228,7 +228,7 @@ int run_add_interactive(const char *revision, const char *patch_mode,
                /* pass original pathspec, to be re-parsed */
                strvec_push(&argv, pathspec->items[i].original);
 
-       status = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+       status = run_command_v_opt(argv.v, RUN_GIT_CMD);
        strvec_clear(&argv);
        return status;
 }

diff --git a/builtin/am.c b/builtin/am.c
index 992ab3ca2733ff837d41f50cabb08ad7bd500540..dd4e6c2d9b7f478c322a469fd64cbaf3de285d17 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -812,7 +812,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
        strbuf_release(&sb);
        free(series_dir_buf);
 
-       ret = split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr);
+       ret = split_mail_conv(stgit_patch_to_mail, state, patches.v, keep_cr);
 
        strvec_clear(&patches);
        return ret;
@@ -1002,7 +1002,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
        }
        write_state_text(state, "scissors", str);
 
-       sq_quote_argv(&sb, state->git_apply_opts.argv);
+       sq_quote_argv(&sb, state->git_apply_opts.v);
        write_state_text(state, "apply-opt", sb.buf);
 
        if (state->rebasing)
@@ -1401,9 +1401,9 @@ static int run_apply(const struct am_state *state, const char *index_file)
                BUG("init_apply_state() failed");
 
        strvec_push(&apply_opts, "apply");
-       strvec_pushv(&apply_opts, state->git_apply_opts.argv);
+       strvec_pushv(&apply_opts, state->git_apply_opts.v);
 
-       opts_left = apply_parse_options(apply_opts.argc, apply_opts.argv,
+       opts_left = apply_parse_options(apply_opts.nr, apply_opts.v,
                                        &apply_state, &force_apply, &options,
                                        NULL);
 
@@ -1428,7 +1428,7 @@ static int run_apply(const struct am_state *state, const char *index_file)
 
        strvec_push(&apply_paths, am_path(state, "patch"));
 
-       res = apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);
+       res = apply_all_patches(&apply_state, apply_paths.nr, apply_paths.v, options);
 
        strvec_clear(&apply_paths);
        strvec_clear(&apply_opts);
@@ -1455,7 +1455,7 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f
 
        cp.git_cmd = 1;
        strvec_push(&cp.args, "apply");
-       strvec_pushv(&cp.args, state->git_apply_opts.argv);
+       strvec_pushv(&cp.args, state->git_apply_opts.v);
        strvec_pushf(&cp.args, "--build-fake-ancestor=%s", index_file);
        strvec_push(&cp.args, am_path(state, "patch"));
 
@@ -2376,10 +2376,10 @@ int cmd_am(int argc, const char **argv, const char *prefix)
                                strvec_push(&paths, mkpath("%s/%s", prefix, argv[i]));
                }
 
-               if (state.interactive && !paths.argc)
+               if (state.interactive && !paths.nr)
                        die(_("interactive mode requires patches on the command line"));
 
-               am_setup(&state, patch_format, paths.argv, keep_cr);
+               am_setup(&state, patch_format, paths.v, keep_cr);
 
                strvec_clear(&paths);
        }

diff --git a/builtin/annotate.c b/builtin/annotate.c
index 7b7ecd366dc3e58892adc82d6ba52f79b3d6fd3e..58ff977a2314e2878ee0c7d3bcd9874b71bfdeef 100644 (file)
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -18,5 +18,5 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
                strvec_push(&args, argv[i]);
        }
 
-       return cmd_blame(args.argc, args.argv, prefix);
+       return cmd_blame(args.nr, args.v, prefix);
 }

diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index dd52878413d3d1db9df2b0a777cd9e18fcd8f416..b46de0489e5583688c2c8111abf09c53e12170f3 100644 (file)
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -168,7 +168,7 @@ static int bisect_reset(const char *commit)
                struct strvec argv = STRVEC_INIT;
 
                strvec_pushl(&argv, "checkout", branch.buf, "--", NULL);
-               if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+               if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
                        error(_("could not check out original"
                                " HEAD '%s'. Try 'git bisect"
                                " reset <commit>'."), branch.buf);
@@ -530,7 +530,7 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 
                        strvec_pushl(&argv, "checkout", start_head.buf,
                                     "--", NULL);
-                       if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+                       if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
                                res = error(_("checking out '%s' failed."
                                                 " Try 'git bisect start "
                                                 "<valid-branch>'."),

diff --git a/builtin/clone.c b/builtin/clone.c
index e26bd82dc4e81b0a32d6d9669f09353848e4d775..fccc814a54ea7f585ddfa23ac584f4139bc6e967 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -752,7 +752,7 @@ static int git_sparse_checkout_init(const char *repo)
         */
        core_apply_sparse_checkout = 1;
 
-       if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+       if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
                error(_("failed to initialize sparse-checkout"));
                result = 1;
        }
@@ -844,7 +844,7 @@ static int checkout(int submodule_progress)
                                               "--single-branch" :
                                               "--no-single-branch");
 
-               err = run_command_v_opt(args.argv, RUN_GIT_CMD);
+               err = run_command_v_opt(args.v, RUN_GIT_CMD);
                strvec_clear(&args);
        }
 

diff --git a/builtin/commit.c b/builtin/commit.c
index c3f4067537ce75f84cd12116dffe7299c31b4f09..69ac78d5e524f49e5da993e16cf3b74cf080926e 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1008,7 +1008,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
                struct strvec env = STRVEC_INIT;
 
                strvec_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
-               if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) {
+               if (launch_editor(git_path_commit_editmsg(), NULL, env.v)) {
                        fprintf(stderr,
                        _("Please supply the message using either -m or -F option.\n"));
                        exit(1);

diff --git a/builtin/describe.c b/builtin/describe.c
index e3cac8002c9fc8a2ead0053f6d5fe4b6f05f982b..7668591d575acc3fe744763b7e53128c76aaf862 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -509,7 +509,7 @@ static void describe_blob(struct object_id oid, struct strbuf *dst)
                     NULL);
 
        repo_init_revisions(the_repository, &revs, NULL);
-       if (setup_revisions(args.argc, args.argv, &revs, NULL) > 1)
+       if (setup_revisions(args.nr, args.v, &revs, NULL) > 1)
                BUG("setup_revisions could not handle all args?");
 
        if (prepare_revision_walk(&revs))
@@ -613,7 +613,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                        strvec_pushv(&args, argv);
                else
                        strvec_push(&args, "HEAD");
-               return cmd_name_rev(args.argc, args.argv, prefix);
+               return cmd_name_rev(args.nr, args.v, prefix);
        }
 
        hashmap_init(&names, commit_name_neq, NULL, 0);
@@ -659,7 +659,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 
                        repo_init_revisions(the_repository, &revs, prefix);
                        strvec_pushv(&args, diff_index_args);
-                       if (setup_revisions(args.argc, args.argv, &revs, NULL) != 1)
+                       if (setup_revisions(args.nr, args.v, &revs, NULL) != 1)
                                BUG("malformed internal diff-index command line");
                        result = run_diff_index(&revs, 0);
 

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 5ac021a1d4720bd5f4148dad479894be138bbabc..7ac432b88193e7468048821a372dae8c2a81919a 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -683,7 +683,7 @@ static int run_file_diff(int prompt, const char *prefix,
        strvec_push(&args, "diff");
        for (i = 0; i < argc; i++)
                strvec_push(&args, argv[i]);
-       ret = run_command_v_opt_cd_env(args.argv, RUN_GIT_CMD, prefix, env);
+       ret = run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
        exit(ret);
 }
 

diff --git a/builtin/fetch.c b/builtin/fetch.c
index c2e7afeb6afb171738fb4caaff3e6b40fd02b29b..c49f0e975203b039cbcf2ccab9860904f3f67e47 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1354,7 +1354,7 @@ static int do_fetch(struct transport *transport,
 
        if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
                must_list_refs = 1;
-               if (ref_prefixes.argc)
+               if (ref_prefixes.nr)
                        strvec_push(&ref_prefixes, "refs/tags/");
        }
 
@@ -1605,7 +1605,7 @@ static int fetch_multiple(struct string_list *list, int max_children)
        add_options_to_argv(&argv);
 
        if (max_children != 1 && list->nr != 1) {
-               struct parallel_fetch_state state = { argv.argv, list, 0, 0 };
+               struct parallel_fetch_state state = { argv.v, list, 0, 0 };
 
                strvec_push(&argv, "--end-of-options");
                result = run_processes_parallel_tr2(max_children,
@@ -1623,7 +1623,7 @@ static int fetch_multiple(struct string_list *list, int max_children)
                        strvec_push(&argv, name);
                        if (verbosity >= 0)
                                printf(_("Fetching %s\n"), name);
-                       if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+                       if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
                                error(_("Could not fetch %s"), name);
                                result = 1;
                        }

diff --git a/builtin/gc.c b/builtin/gc.c
index 98719800a31379680c5c8402ef484594eaedb6f9..aafa0946f5245792a573c6e8d0326a72fa815df7 100644 (file)
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -514,11 +514,11 @@ static void gc_before_repack(void)
        if (done++)
                return;
 
-       if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
-               die(FAILED_RUN, pack_refs_cmd.argv[0]);
+       if (pack_refs && run_command_v_opt(pack_refs_cmd.v, RUN_GIT_CMD))
+               die(FAILED_RUN, pack_refs_cmd.v[0]);
 
-       if (prune_reflogs && run_command_v_opt(reflog.argv, RUN_GIT_CMD))
-               die(FAILED_RUN, reflog.argv[0]);
+       if (prune_reflogs && run_command_v_opt(reflog.v, RUN_GIT_CMD))
+               die(FAILED_RUN, reflog.v[0]);
 }
 
 int cmd_gc(int argc, const char **argv, const char *prefix)
@@ -653,8 +653,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 
        if (!repository_format_precious_objects) {
                close_object_store(the_repository->objects);
-               if (run_command_v_opt(repack.argv, RUN_GIT_CMD))
-                       die(FAILED_RUN, repack.argv[0]);
+               if (run_command_v_opt(repack.v, RUN_GIT_CMD))
+                       die(FAILED_RUN, repack.v[0]);
 
                if (prune_expire) {
                        strvec_push(&prune, prune_expire);
@@ -663,19 +663,19 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
                        if (has_promisor_remote())
                                strvec_push(&prune,
                                            "--exclude-promisor-objects");
-                       if (run_command_v_opt(prune.argv, RUN_GIT_CMD))
-                               die(FAILED_RUN, prune.argv[0]);
+                       if (run_command_v_opt(prune.v, RUN_GIT_CMD))
+                               die(FAILED_RUN, prune.v[0]);
                }
        }
 
        if (prune_worktrees_expire) {
                strvec_push(&prune_worktrees, prune_worktrees_expire);
-               if (run_command_v_opt(prune_worktrees.argv, RUN_GIT_CMD))
-                       die(FAILED_RUN, prune_worktrees.argv[0]);
+               if (run_command_v_opt(prune_worktrees.v, RUN_GIT_CMD))
+                       die(FAILED_RUN, prune_worktrees.v[0]);
        }
 
-       if (run_command_v_opt(rerere.argv, RUN_GIT_CMD))
-               die(FAILED_RUN, rerere.argv[0]);
+       if (run_command_v_opt(rerere.v, RUN_GIT_CMD))
+               die(FAILED_RUN, rerere.v[0]);
 
        report_garbage = report_pack_garbage;
        reprepare_packed_git(the_repository);

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 323f8bce804418d5eb5067b2d08f9b4fc1159ef0..f00ae807961d1932757abd9d42f741bad7f9113c 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3704,7 +3704,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
        if (!use_internal_rev_list)
                read_object_list_from_stdin();
        else {
-               get_object_list(rp.argc, rp.argv);
+               get_object_list(rp.nr, rp.v);
                strvec_clear(&rp);
        }
        cleanup_preferred_base();

diff --git a/builtin/pull.c b/builtin/pull.c
index dae8766646d10ba8658278e93e8cb5070960a141..015f6ded0badf82760557fc0c890513de2c147dc 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -584,14 +584,14 @@ static int run_fetch(const char *repo, const char **refspecs)
                strvec_push(&args, "--no-show-forced-updates");
        if (set_upstream)
                strvec_push(&args, set_upstream);
-       strvec_pushv(&args, opt_fetch.argv);
+       strvec_pushv(&args, opt_fetch.v);
 
        if (repo) {
                strvec_push(&args, repo);
                strvec_pushv(&args, refspecs);
        } else if (*refspecs)
                BUG("refspecs without repo?");
-       ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
+       ret = run_command_v_opt(args.v, RUN_GIT_CMD);
        strvec_clear(&args);
        return ret;
 }
@@ -691,8 +691,8 @@ static int run_merge(void)
                strvec_push(&args, opt_ff);
        if (opt_verify_signatures)
                strvec_push(&args, opt_verify_signatures);
-       strvec_pushv(&args, opt_strategies.argv);
-       strvec_pushv(&args, opt_strategy_opts.argv);
+       strvec_pushv(&args, opt_strategies.v);
+       strvec_pushv(&args, opt_strategy_opts.v);
        if (opt_gpg_sign)
                strvec_push(&args, opt_gpg_sign);
        if (opt_autostash == 0)
@@ -703,7 +703,7 @@ static int run_merge(void)
                strvec_push(&args, "--allow-unrelated-histories");
 
        strvec_push(&args, "FETCH_HEAD");
-       ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
+       ret = run_command_v_opt(args.v, RUN_GIT_CMD);
        strvec_clear(&args);
        return ret;
 }
@@ -882,8 +882,8 @@ static int run_rebase(const struct object_id *curr_head,
                strvec_push(&args, "--interactive");
        if (opt_diffstat)
                strvec_push(&args, opt_diffstat);
-       strvec_pushv(&args, opt_strategies.argv);
-       strvec_pushv(&args, opt_strategy_opts.argv);
+       strvec_pushv(&args, opt_strategies.v);
+       strvec_pushv(&args, opt_strategy_opts.v);
        if (opt_gpg_sign)
                strvec_push(&args, opt_gpg_sign);
        if (opt_autostash == 0)
@@ -902,7 +902,7 @@ static int run_rebase(const struct object_id *curr_head,
        else
                strvec_push(&args, oid_to_hex(merge_head));
 
-       ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
+       ret = run_command_v_opt(args.v, RUN_GIT_CMD);
        strvec_clear(&args);
        return ret;
 }

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 35aeb8effc29a90aa22baac5246a2e5a780811e3..dadb52fa92e7f28e0c81b27b74b9a23b289e4be9 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -351,7 +351,7 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
                             oid_to_hex(&opts->restrict_revision->object.oid));
 
        ret = sequencer_make_script(the_repository, &todo_list.buf,
-                                   make_script_args.argc, make_script_args.argv,
+                                   make_script_args.nr, make_script_args.v,
                                    flags);
 
        if (ret)
@@ -900,7 +900,7 @@ static int run_am(struct rebase_options *opts)
                return status;
        }
 
-       strvec_pushv(&am.args, opts->git_am_opts.argv);
+       strvec_pushv(&am.args, opts->git_am_opts.v);
        strvec_push(&am.args, "--rebasing");
        strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
        strvec_push(&am.args, "--patch-format=mboxrd");
@@ -969,7 +969,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
        add_var(&script_snippet, "revisions", opts->revisions);
        add_var(&script_snippet, "restrict_revision", opts->restrict_revision ?
                oid_to_hex(&opts->restrict_revision->object.oid) : NULL);
-       sq_quote_argv_pretty(&buf, opts->git_am_opts.argv);
+       sq_quote_argv_pretty(&buf, opts->git_am_opts.v);
        add_var(&script_snippet, "git_am_opt", buf.buf);
        strbuf_release(&buf);
        add_var(&script_snippet, "verbose",
@@ -1625,8 +1625,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                allow_preemptive_ff = 0;
        }
 
-       for (i = 0; i < options.git_am_opts.argc; i++) {
-               const char *option = options.git_am_opts.argv[i], *p;
+       for (i = 0; i < options.git_am_opts.nr; i++) {
+               const char *option = options.git_am_opts.v[i], *p;
                if (!strcmp(option, "--committer-date-is-author-date") ||
                    !strcmp(option, "--ignore-date") ||
                    !strcmp(option, "--whitespace=fix") ||
@@ -1721,10 +1721,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        if (isatty(2) && options.flags & REBASE_NO_QUIET)
                strbuf_addstr(&options.git_format_patch_opt, " --progress");
 
-       if (options.git_am_opts.argc || options.type == REBASE_APPLY) {
+       if (options.git_am_opts.nr || options.type == REBASE_APPLY) {
                /* all am options except -q are compatible only with --apply */
-               for (i = options.git_am_opts.argc - 1; i >= 0; i--)
-                       if (strcmp(options.git_am_opts.argv[i], "-q"))
+               for (i = options.git_am_opts.nr - 1; i >= 0; i--)
+                       if (strcmp(options.git_am_opts.v[i], "-q"))
                                break;
 
                if (i >= 0) {

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 1fc69cf5bca6ba7fe2589d18e706fed673290e1e..439f29d6c7f4c5bc856611a3e900ff7e9a77b9f5 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -950,7 +950,7 @@ static const char *push_to_deploy(unsigned char *sha1,
        struct child_process child = CHILD_PROCESS_INIT;
 
        child.argv = update_refresh;
-       child.env = env->argv;
+       child.env = env->v;
        child.dir = work_tree;
        child.no_stdin = 1;
        child.stdout_to_stderr = 1;
@@ -961,7 +961,7 @@ static const char *push_to_deploy(unsigned char *sha1,
        /* run_command() does not clean up completely; reinitialize */
        child_process_init(&child);
        child.argv = diff_files;
-       child.env = env->argv;
+       child.env = env->v;
        child.dir = work_tree;
        child.no_stdin = 1;
        child.stdout_to_stderr = 1;
@@ -974,7 +974,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 
        child_process_init(&child);
        child.argv = diff_index;
-       child.env = env->argv;
+       child.env = env->v;
        child.no_stdin = 1;
        child.no_stdout = 1;
        child.stdout_to_stderr = 0;
@@ -985,7 +985,7 @@ static const char *push_to_deploy(unsigned char *sha1,
        read_tree[3] = hash_to_hex(sha1);
        child_process_init(&child);
        child.argv = read_tree;
-       child.env = env->argv;
+       child.env = env->v;
        child.dir = work_tree;
        child.no_stdin = 1;
        child.no_stdout = 1;
@@ -1004,7 +1004,7 @@ static const char *push_to_checkout(unsigned char *hash,
                                    const char *work_tree)
 {
        strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
-       if (run_hook_le(env->argv, push_to_checkout_hook,
+       if (run_hook_le(env->v, push_to_checkout_hook,
                        hash_to_hex(hash), NULL))
                return "push-to-checkout hook declined";
        else
@@ -1205,11 +1205,11 @@ static void run_update_post_hook(struct command *commands)
        for (cmd = commands; cmd; cmd = cmd->next) {
                if (cmd->error_string || cmd->did_not_exist)
                        continue;
-               if (!proc.args.argc)
+               if (!proc.args.nr)
                        strvec_push(&proc.args, hook);
                strvec_push(&proc.args, cmd->ref_name);
        }
-       if (!proc.args.argc)
+       if (!proc.args.nr)
                return;
 
        proc.no_stdin = 1;

diff --git a/builtin/remote.c b/builtin/remote.c
index a3b33c2c88d2997892be659b8aab637b71250f7d..c8240e9fcd58b838086dc667414dc78fb3f2912a 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1470,7 +1470,7 @@ static int update(int argc, const char **argv)
        for (i = 1; i < argc; 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) {
                        strvec_pop(&fetch_argv);
@@ -1478,7 +1478,7 @@ static int update(int argc, const char **argv)
                }
        }
 
-       retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD);
+       retval = run_command_v_opt(fetch_argv.v, RUN_GIT_CMD);
        strvec_clear(&fetch_argv);
        return retval;
 }

diff --git a/builtin/replace.c b/builtin/replace.c
index 7bc5d66ed919e7f1005ede64aa89adb6a8dbba3a..cd48765911746420766736eaa3be7160cc790ce2 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -513,7 +513,7 @@ static int convert_graft_file(int force)
                        continue;
 
                strvec_split(&args, buf.buf);
-               if (args.argc && create_graft(args.argc, args.argv, force, 1))
+               if (args.nr && create_graft(args.nr, args.v, force, 1))
                        strbuf_addf(&err, "\n\t%s", buf.buf);
                strvec_clear(&args);
        }

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 4c918ce90daa9beb1aeeed07e7e68124d4c695ed..7eae5f38016dab4b0f4e9a4fdc7d496962389464 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -561,7 +561,7 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
                 * default_arg is now passed to parse_options(), so we need to
                 * mimic the real argv a bit better.
                 */
-               if (!default_args.argc)
+               if (!default_args.nr)
                        strvec_push(&default_args, "show-branch");
                strvec_push(&default_args, value);
                return 0;
@@ -684,9 +684,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
        git_config(git_show_branch_config, NULL);
 
        /* If nothing is specified, try the default first */
-       if (ac == 1 && default_args.argc) {
-               ac = default_args.argc;
-               av = default_args.argv;
+       if (ac == 1 && default_args.nr) {
+               ac = default_args.nr;
+               av = default_args.v;
        }
 
        ac = parse_options(ac, av, prefix, builtin_show_branch_options,

diff --git a/builtin/stash.c b/builtin/stash.c
index bfdbafae890d4d6a7fbf085acd9fac20ef0a02f0..10d87630cd0017f177b8c33929e5a94adaee6b0e 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -745,7 +745,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
                        strvec_push(&revision_args, argv[i]);
        }
 
-       ret = get_stash_info(&info, stash_args.argc, stash_args.argv);
+       ret = get_stash_info(&info, stash_args.nr, stash_args.v);
        strvec_clear(&stash_args);
        if (ret)
                return -1;
@@ -754,7 +754,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
         * The config settings are applied only if there are not passed
         * any options.
         */
-       if (revision_args.argc == 1) {
+       if (revision_args.nr == 1) {
                if (show_stat)
                        rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
 
@@ -767,7 +767,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
                }
        }
 
-       argc = setup_revisions(revision_args.argc, revision_args.argv, &rev, NULL);
+       argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL);
        if (argc > 1) {
                free_stash_info(&info);
                usage_with_options(git_stash_show_usage, options);
@@ -1611,5 +1611,5 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
        /* Assume 'stash push' */
        strvec_push(&args, "push");
        strvec_pushv(&args, argv);
-       return !!push_stash(args.argc, args.argv, prefix, 1);
+       return !!push_stash(args.nr, args.v, prefix, 1);
 }

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 665db1ffedd14c5c803fa18fb259c63a42738650..df135abbf10342472f692203d9006943af79294f 100644 (file)
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -817,9 +817,9 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 
        repo_init_revisions(the_repository, &rev, NULL);
        rev.abbrev = 0;
-       diff_files_args.argc = setup_revisions(diff_files_args.argc,
-                                              diff_files_args.argv,
-                                              &rev, NULL);
+       diff_files_args.nr = setup_revisions(diff_files_args.nr,
+                                            diff_files_args.v,
+                                            &rev, NULL);
        diff_files_result = run_diff_files(&rev, 0);
 
        if (!diff_result_code(&rev.diffopt, diff_files_result)) {

diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index f02bb0ea15f80d9f2c455e867bcf3f49bc411acf..24654b4c9bf0664e4a2f41b42d3224062199ca81 100644 (file)
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -36,7 +36,7 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
                char *buf = packet_read_line(0, NULL);
                if (!buf)
                        break;  /* got a flush */
-               if (sent_argv.argc > MAX_ARGS)
+               if (sent_argv.nr > MAX_ARGS)
                        die("Too many options (>%d)", MAX_ARGS - 1);
 
                if (!starts_with(buf, arg_cmd))
@@ -45,7 +45,7 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
        }
 
        /* parse all options sent by the client */
-       return write_archive(sent_argv.argc, sent_argv.argv, prefix,
+       return write_archive(sent_argv.nr, sent_argv.v, prefix,
                             the_repository, NULL, 1);
 }
 

diff --git a/builtin/worktree.c b/builtin/worktree.c
index be5d84f0a041ac972e8edef6f18ec44d9d95d564..378f332b5d07edb55b48559ba328f980b84927e6 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -422,7 +422,7 @@ static int add_worktree(const char *path, const char *refname,
                        strvec_push(&cp.args, "--quiet");
        }
 
-       cp.env = child_env.argv;
+       cp.env = child_env.v;
        ret = run_command(&cp);
        if (ret)
                goto done;
@@ -433,7 +433,7 @@ static int add_worktree(const char *path, const char *refname,
                strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
                if (opts->quiet)
                        strvec_push(&cp.args, "--quiet");
-               cp.env = child_env.argv;
+               cp.env = child_env.v;
                ret = run_command(&cp);
                if (ret)
                        goto done;
@@ -943,7 +943,7 @@ static void check_clean_worktree(struct worktree *wt,
        strvec_pushl(&cp.args, "status",
                     "--porcelain", "--ignore-submodules=none",
                     NULL);
-       cp.env = child_env.argv;
+       cp.env = child_env.v;
        cp.git_cmd = 1;
        cp.dir = wt->path;
        cp.out = -1;

diff --git a/bundle.c b/bundle.c
index 565d05367fbf151cea4f772f778c324276037f4f..7ef9c3a7c387e140f5d5bbdb43d832ab2dbf7c71 100644 (file)
--- a/bundle.c
+++ b/bundle.c
@@ -278,7 +278,7 @@ static int write_pack_data(int bundle_fd, struct rev_info *revs, struct strvec *
                     "pack-objects",
                     "--stdout", "--thin", "--delta-base-offset",
                     NULL);
-       strvec_pushv(&pack_objects.args, pack_options->argv);
+       strvec_pushv(&pack_objects.args, pack_options->v);
        pack_objects.in = -1;
        pack_objects.out = bundle_fd;
        pack_objects.git_cmd = 1;

diff --git a/commit.c b/commit.c
index a5176a25bd6b61fb0a81683253fc57c901391f61..4ce8cb38d5efe01a51648b4187acc291f588c012 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1643,7 +1643,7 @@ int run_commit_hook(int editor_is_used, const char *index_file,
                strvec_push(&hook_env, "GIT_EDITOR=:");
 
        va_start(args, name);
-       ret = run_hook_ve(hook_env.argv,name, args);
+       ret = run_hook_ve(hook_env.v, name, args);
        va_end(args);
        strvec_clear(&hook_env);
 

diff --git a/connect.c b/connect.c
index 3299ea956a7c0b98e7d6e237a67d949eef6567dd..0b6aba177e0f4dd3a999e3382d61cc71cf5b33e2 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -70,9 +70,9 @@ int server_supports_v2(const char *c, int die_on_error)
 {
        int i;
 
-       for (i = 0; i < server_capabilities_v2.argc; i++) {
+       for (i = 0; i < server_capabilities_v2.nr; i++) {
                const char *out;
-               if (skip_prefix(server_capabilities_v2.argv[i], c, &out) &&
+               if (skip_prefix(server_capabilities_v2.v[i], c, &out) &&
                    (!*out || *out == '='))
                        return 1;
        }
@@ -87,9 +87,9 @@ int server_feature_v2(const char *c, const char **v)
 {
        int i;
 
-       for (i = 0; i < server_capabilities_v2.argc; i++) {
+       for (i = 0; i < server_capabilities_v2.nr; i++) {
                const char *out;
-               if (skip_prefix(server_capabilities_v2.argv[i], c, &out) &&
+               if (skip_prefix(server_capabilities_v2.v[i], c, &out) &&
                    (*out == '=')) {
                        *v = out + 1;
                        return 1;
@@ -103,9 +103,9 @@ int server_supports_feature(const char *c, const char *feature,
 {
        int i;
 
-       for (i = 0; i < server_capabilities_v2.argc; i++) {
+       for (i = 0; i < server_capabilities_v2.nr; i++) {
                const char *out;
-               if (skip_prefix(server_capabilities_v2.argv[i], c, &out) &&
+               if (skip_prefix(server_capabilities_v2.v[i], c, &out) &&
                    (!*out || *(out++) == '=')) {
                        if (parse_feature_request(out, feature))
                                return 1;
@@ -488,9 +488,9 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
        if (!for_push)
                packet_write_fmt(fd_out, "peel\n");
        packet_write_fmt(fd_out, "symrefs\n");
-       for (i = 0; ref_prefixes && i < ref_prefixes->argc; i++) {
+       for (i = 0; ref_prefixes && i < ref_prefixes->nr; i++) {
                packet_write_fmt(fd_out, "ref-prefix %s\n",
-                                ref_prefixes->argv[i]);
+                                ref_prefixes->v[i]);
        }
        packet_flush(fd_out);
 

diff --git a/daemon.c b/daemon.c
index 0dec89fa02d30c1a809f16e20d7099f8edbb67e3..2ab7ea82eb0b4f7c62c553e1e65c16644983f7de 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -482,7 +482,7 @@ static int upload_pack(const struct strvec *env)
        strvec_pushl(&cld.args, "upload-pack", "--strict", NULL);
        strvec_pushf(&cld.args, "--timeout=%u", timeout);
 
-       strvec_pushv(&cld.env_array, env->argv);
+       strvec_pushv(&cld.env_array, env->v);
 
        return run_service_command(&cld);
 }
@@ -492,7 +492,7 @@ static int upload_archive(const struct strvec *env)
        struct child_process cld = CHILD_PROCESS_INIT;
        strvec_push(&cld.args, "upload-archive");
 
-       strvec_pushv(&cld.env_array, env->argv);
+       strvec_pushv(&cld.env_array, env->v);
 
        return run_service_command(&cld);
 }
@@ -502,7 +502,7 @@ static int receive_pack(const struct strvec *env)
        struct child_process cld = CHILD_PROCESS_INIT;
        strvec_push(&cld.args, "receive-pack");
 
-       strvec_pushv(&cld.env_array, env->argv);
+       strvec_pushv(&cld.env_array, env->v);
 
        return run_service_command(&cld);
 }
@@ -927,7 +927,7 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 #endif
        }
 
-       cld.argv = cld_argv.argv;
+       cld.argv = cld_argv.v;
        cld.in = incoming;
        cld.out = dup(incoming);
 

diff --git a/diff.c b/diff.c
index f1a3758922a353c424c7cc21bbde34fc4820095b..f9709de7b4540d1ddf7dda7bbb38a54bbbb8d952 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4239,7 +4239,7 @@ static void run_external_diff(const char *pgm,
 
        diff_free_filespec_data(one);
        diff_free_filespec_data(two);
-       if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
+       if (run_command_v_opt_cd_env(argv.v, RUN_USING_SHELL, NULL, env.v))
                die(_("external diff died, stopping at %s"), name);
 
        remove_tempfile();

diff --git a/environment.c b/environment.c
index 00fe20e496e4c2a8062bab6b79140ea1098ecb3b..52e0c979ba06e48f427c283a133f39fc7216b7b0 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -164,7 +164,7 @@ static const char *getenv_safe(struct strvec *argv, const char *name)
                return NULL;
 
        strvec_push(argv, value);
-       return argv->argv[argv->argc - 1];
+       return argv->v[argv->nr - 1];
 }
 
 void setup_git_env(const char *git_dir)

diff --git a/exec-cmd.c b/exec-cmd.c
index 0f8e888424cc153cbac0a9db8ed3239e80af5e01..eeb2ee52b83441fd51bd79cea8bf13682bcd522e 100644 (file)
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -324,7 +324,7 @@ const char **prepare_git_cmd(struct strvec *out, const char **argv)
 {
        strvec_push(out, "git");
        strvec_pushv(out, argv);
-       return out->argv;
+       return out->v;
 }
 
 int execv_git_cmd(const char **argv)
@@ -332,10 +332,10 @@ int execv_git_cmd(const char **argv)
        struct strvec nargv = STRVEC_INIT;
 
        prepare_git_cmd(&nargv, argv);
-       trace_argv_printf(nargv.argv, "trace: exec:");
+       trace_argv_printf(nargv.v, "trace: exec:");
 
        /* execvp() can only ever return if it fails */
-       sane_execvp("git", (char **)nargv.argv);
+       sane_execvp("git", (char **)nargv.v);
 
        trace_printf("trace: exec failed: %s\n", strerror(errno));
 

diff --git a/git.c b/git.c
index 258035cfb1ef7171664406e344faf1023217b09f..8bd1d7551daa28dcde69935046a055243c4b4d99 100644 (file)
--- a/git.c
+++ b/git.c
@@ -352,7 +352,7 @@ static int handle_alias(int *argcp, const char ***argv)
                        strvec_push(&child.args, alias_string + 1);
                        strvec_pushv(&child.args, (*argv) + 1);
 
-                       trace2_cmd_alias(alias_command, child.args.argv);
+                       trace2_cmd_alias(alias_command, child.args.v);
                        trace2_cmd_list_config();
                        trace2_cmd_list_env_vars();
                        trace2_cmd_name("_run_shell_alias_");
@@ -667,7 +667,7 @@ static void handle_builtin(int argc, const char **argv)
                }
 
                argc++;
-               argv = args.argv;
+               argv = args.v;
        }
 
        builtin = get_builtin(cmd);
@@ -701,7 +701,7 @@ static void execv_dashed_external(const char **argv)
         * The code in run_command() logs trace2 child_start/child_exit
         * events, so we do not need to report exec/exec_result events here.
         */
-       trace_argv_printf(cmd.args.argv, "trace: exec:");
+       trace_argv_printf(cmd.args.v, "trace: exec:");
 
        /*
         * If we fail because the command is not found, it is
@@ -762,13 +762,13 @@ static int run_argv(int *argcp, const char ***argv)
                        for (i = 0; i < *argcp; i++)
                                strvec_push(&args, (*argv)[i]);
 
-                       trace_argv_printf(args.argv, "trace: exec:");
+                       trace_argv_printf(args.v, "trace: exec:");
 
                        /*
                         * if we fail because the command is not found, it is
                         * OK to return. Otherwise, we just pass along the status code.
                         */
-                       i = run_command_v_opt_tr2(args.argv, RUN_SILENT_EXEC_FAILURE |
+                       i = run_command_v_opt_tr2(args.v, RUN_SILENT_EXEC_FAILURE |
                                                  RUN_CLEAN_ON_EXIT | RUN_WAIT_AFTER_CLEAN, "git_alias");
                        if (i >= 0 || errno != ENOENT)
                                exit(i);

diff --git a/graph.c b/graph.c
index 09c9cc968cb947d9298e8fd533a20aadf636852d..c128ad0cce8f5954eef4730eb70eb0ffab363310 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -355,8 +355,8 @@ struct git_graph *graph_init(struct rev_info *opt)
                        parse_graph_colors_config(&custom_colors, string);
                        free(string);
                        /* graph_set_column_colors takes a max-index, not a count */
-                       graph_set_column_colors(custom_colors.argv,
-                                               custom_colors.argc - 1);
+                       graph_set_column_colors(custom_colors.v,
+                                               custom_colors.nr - 1);
                }
        }
 

diff --git a/http-push.c b/http-push.c
index 31911aa345499a12460f654723672b0f9b145add..6a4a43e07f2cd43ad3b34b409de69d1903fb6fd9 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -1931,7 +1931,7 @@ int cmd_main(int argc, const char **argv)
                        strvec_pushf(&commit_argv, "^%s",
                                     oid_to_hex(&ref->old_oid));
                repo_init_revisions(the_repository, &revs, setup_git_directory());
-               setup_revisions(commit_argv.argc, commit_argv.argv, &revs, NULL);
+               setup_revisions(commit_argv.nr, commit_argv.v, &revs, NULL);
                revs.edge_hint = 0; /* just in case */
 
                /* Generate a list of objects that need to be pushed */

diff --git a/ls-refs.c b/ls-refs.c
index 8192c949f49fdfa514d1502b3c299b904ac8be1f..a1e0b473e44720421a71adeaf6aebb4ceb782f6e 100644 (file)
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -15,11 +15,11 @@ static int ref_match(const struct strvec *prefixes, const char *refname)
 {
        int i;
 
-       if (!prefixes->argc)
+       if (!prefixes->nr)
                return 1; /* no restriction */
 
-       for (i = 0; i < prefixes->argc; i++) {
-               const char *prefix = prefixes->argv[i];
+       for (i = 0; i < prefixes->nr; i++) {
+               const char *prefix = prefixes->v[i];
 
                if (starts_with(refname, prefix))
                        return 1;

diff --git a/merge.c b/merge.c
index a05b054faa27399cd14d2ae1ab0a2534870f1259..753e461659e62812e60fe863bf76269cc8784f82 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -33,7 +33,7 @@ int try_merge_command(struct repository *r,
        for (j = remotes; j; j = j->next)
                strvec_push(&args, merge_argument(j->item));
 
-       ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
+       ret = run_command_v_opt(args.v, RUN_GIT_CMD);
        strvec_clear(&args);
 
        discard_index(r->index);

diff --git a/pathspec.c b/pathspec.c
index c303126f378a9a5867e05140337feb5ff16a4752..7a229d8d22f2f67a8e267fda302b53b35a13a3d4 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -652,7 +652,7 @@ void parse_pathspec_file(struct pathspec *pathspec, unsigned magic_mask,
        if (in != stdin)
                fclose(in);
 
-       parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.argv);
+       parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.v);
        strvec_clear(&parsed_file);
 }
 

diff --git a/range-diff.c b/range-diff.c
index 831c490bf2c7648afb91476135cbf0c4831d7969..24dc435e482c0364ebc88e7ad55930f437d73ad2 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -67,7 +67,7 @@ static int read_patches(const char *range, struct string_list *list,
                     "--notes",
                     NULL);
        if (other_arg)
-               strvec_pushv(&cp.args, other_arg->argv);
+               strvec_pushv(&cp.args, other_arg->v);
        strvec_push(&cp.args, range);
        cp.out = -1;
        cp.no_stdin = 1;

diff --git a/ref-filter.c b/ref-filter.c
index 7f013851edc988ec7951351c8f0b4f93ce248714..0d3a56b79beb0b59f84037d5df5b69ea1cd9d1a2 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -1918,9 +1918,9 @@ static void find_longest_prefixes(struct string_list *out,
        struct strbuf prefix = STRBUF_INIT;
 
        strvec_pushv(&sorted, patterns);
-       QSORT(sorted.argv, sorted.argc, qsort_strcmp);
+       QSORT(sorted.v, sorted.nr, qsort_strcmp);
 
-       find_longest_prefixes_1(out, &prefix, sorted.argv, sorted.argc);
+       find_longest_prefixes_1(out, &prefix, sorted.v, sorted.nr);
 
        strvec_clear(&sorted);
        strbuf_release(&prefix);

diff --git a/remote-curl.c b/remote-curl.c
index 7feaddc00304dae142a6ee5790aa8eb4bfc5b8d0..41c3ac5c92a9ac537a289ace83deccef96701e00 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -1190,7 +1190,7 @@ static int fetch_git(struct discovery *heads,
        rpc.service_name = "git-upload-pack",
        rpc.gzip_request = 1;
 
-       err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result);
+       err = rpc_service(&rpc, heads, args.v, &preamble, &rpc_result);
        if (rpc_result.len)
                write_or_die(1, rpc_result.buf, rpc_result.len);
        strbuf_release(&rpc_result);
@@ -1325,7 +1325,7 @@ static int push_git(struct discovery *heads, int nr_spec, const char **specs)
        memset(&rpc, 0, sizeof(rpc));
        rpc.service_name = "git-receive-pack",
 
-       err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result);
+       err = rpc_service(&rpc, heads, args.v, &preamble, &rpc_result);
        if (rpc_result.len)
                write_or_die(1, rpc_result.buf, rpc_result.len);
        strbuf_release(&rpc_result);
@@ -1366,7 +1366,7 @@ static void parse_push(struct strbuf *buf)
                        break;
        } while (1);
 
-       ret = push(specs.argc, specs.argv);
+       ret = push(specs.nr, specs.v);
        printf("\n");
        fflush(stdout);
 

diff --git a/remote.c b/remote.c
index b4665fe5a33b0cf092991ddb8497649461d40e45..c5ed74f91c63b090ddd916c4fa235a0ebf62f558 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1919,7 +1919,7 @@ static int stat_branch_pair(const char *branch_name, const char *base,
        strvec_push(&argv, "--");
 
        repo_init_revisions(the_repository, &revs, NULL);
-       setup_revisions(argv.argc, argv.argv, &revs, NULL);
+       setup_revisions(argv.nr, argv.v, &revs, NULL);
        if (prepare_revision_walk(&revs))
                die(_("revision walk setup failed"));
 

diff --git a/revision.c b/revision.c
index e144132ae97e878d65a37b185a1a983fa7138bd5..bc69f19141e1b2c8d1c774924836a8165392530f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2767,7 +2767,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
                        got_rev_arg = 1;
        }
 
-       if (prune_data.argc) {
+       if (prune_data.nr) {
                /*
                 * If we need to introduce the magic "a lone ':' means no
                 * pathspec whatsoever", here is the place to do so.
@@ -2783,7 +2783,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
                 * }
                 */
                parse_pathspec(&revs->prune_data, 0, 0,
-                              revs->prefix, prune_data.argv);
+                              revs->prefix, prune_data.v);
        }
        strvec_clear(&prune_data);
 

diff --git a/run-command.c b/run-command.c
index b9630a1b5fc62a1eb9de69cf61d4a499bf9f3682..cc9c3296ba0cbb852300d7d5ccb3d6f29f931034 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -287,7 +287,7 @@ static const char **prepare_shell_cmd(struct strvec *out, const char **argv)
        }
 
        strvec_pushv(out, argv);
-       return out->argv;
+       return out->v;
 }
 
 #ifndef GIT_WINDOWS_NATIVE
@@ -426,11 +426,11 @@ static int prepare_cmd(struct strvec *out, const struct child_process *cmd)
         * there are dir separator characters, we have exec attempt to invoke
         * the command directly.
         */
-       if (!has_dir_sep(out->argv[1])) {
-               char *program = locate_in_PATH(out->argv[1]);
+       if (!has_dir_sep(out->v[1])) {
+               char *program = locate_in_PATH(out->v[1]);
                if (program) {
-                       free((char *)out->argv[1]);
-                       out->argv[1] = program;
+                       free((char *)out->v[1]);
+                       out->v[1] = program;
                } else {
                        strvec_clear(out);
                        errno = ENOENT;
@@ -672,9 +672,9 @@ int start_command(struct child_process *cmd)
        char *str;
 
        if (!cmd->argv)
-               cmd->argv = cmd->args.argv;
+               cmd->argv = cmd->args.v;
        if (!cmd->env)
-               cmd->env = cmd->env_array.argv;
+               cmd->env = cmd->env_array.v;
 
        /*
         * In case of errors we must keep the promise to close FDs
@@ -846,10 +846,10 @@ fail_pipe:
                 * be used in the event exec failed with ENOEXEC at which point
                 * we will try to interpret the command using 'sh'.
                 */
-               execve(argv.argv[1], (char *const *) argv.argv + 1,
+               execve(argv.v[1], (char *const *) argv.v + 1,
                       (char *const *) childenv);
                if (errno == ENOEXEC)
-                       execve(argv.argv[0], (char *const *) argv.argv,
+                       execve(argv.v[0], (char *const *) argv.v,
                               (char *const *) childenv);
 
                if (errno == ENOENT) {
@@ -1874,7 +1874,7 @@ int run_auto_gc(int quiet)
        strvec_pushl(&argv_gc_auto, "gc", "--auto", NULL);
        if (quiet)
                strvec_push(&argv_gc_auto, "--quiet");
-       status = run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
+       status = run_command_v_opt(argv_gc_auto.v, RUN_GIT_CMD);
        strvec_clear(&argv_gc_auto);
        return status;
 }

diff --git a/sequencer.c b/sequencer.c
index 31a2b1ab555cd57c5312abe48a96a530fcb72b5d..cc3f8fa88ea96df3480a8721a20fa61a08c2114c 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -2761,7 +2761,7 @@ static int reset_merge(const struct object_id *oid)
        if (!is_null_oid(oid))
                strvec_push(&argv, oid_to_hex(oid));
 
-       ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+       ret = run_command_v_opt(argv.v, RUN_GIT_CMD);
        strvec_clear(&argv);
 
        return ret;
@@ -3135,7 +3135,7 @@ static int do_exec(struct repository *r, const char *command_line)
        strvec_pushf(&child_env, "GIT_WORK_TREE=%s",
                     absolute_path(get_git_work_tree()));
        status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
-                                         child_env.argv);
+                                         child_env.v);
 
        /* force re-reading of the cache */
        if (discard_index(r->index) < 0 || repo_read_index(r) < 0)

diff --git a/serve.c b/serve.c
index 523a9be32d1480c9f4cd5a40b83c67fd3c9639eb..f6341206c4e30122c3cb819ef8c01f6d2be06d22 100644 (file)
--- a/serve.c
+++ b/serve.c
@@ -146,9 +146,9 @@ int has_capability(const struct strvec *keys, const char *capability,
                   const char **value)
 {
        int i;
-       for (i = 0; i < keys->argc; i++) {
+       for (i = 0; i < keys->nr; i++) {
                const char *out;
-               if (skip_prefix(keys->argv[i], capability, &out) &&
+               if (skip_prefix(keys->v[i], capability, &out) &&
                    (!*out || *out == '=')) {
                        if (value) {
                                if (*out == '=')
@@ -223,7 +223,7 @@ static int process_request(void)
                         * If no command and no keys were given then the client
                         * wanted to terminate the connection.
                         */
-                       if (!keys.argc)
+                       if (!keys.nr)
                                return 1;
 
                        /*

diff --git a/strvec.c b/strvec.c
index 9e76ab9295b743d6273be3a94eed9b264f27a4c0..21dce0a7a4d211f9810a95682fcd7cfe4635b6a2 100644 (file)
--- a/strvec.c
+++ b/strvec.c
@@ -6,25 +6,25 @@ const char *empty_strvec[] = { NULL };
 
 void strvec_init(struct strvec *array)
 {
-       array->argv = empty_strvec;
-       array->argc = 0;
+       array->v = empty_strvec;
+       array->nr = 0;
        array->alloc = 0;
 }
 
 static void strvec_push_nodup(struct strvec *array, const char *value)
 {
-       if (array->argv == empty_strvec)
-               array->argv = NULL;
+       if (array->v == empty_strvec)
+               array->v = NULL;
 
-       ALLOC_GROW(array->argv, array->argc + 2, array->alloc);
-       array->argv[array->argc++] = value;
-       array->argv[array->argc] = NULL;
+       ALLOC_GROW(array->v, array->nr + 2, array->alloc);
+       array->v[array->nr++] = value;
+       array->v[array->nr] = NULL;
 }
 
 const char *strvec_push(struct strvec *array, const char *value)
 {
        strvec_push_nodup(array, xstrdup(value));
-       return array->argv[array->argc - 1];
+       return array->v[array->nr - 1];
 }
 
 const char *strvec_pushf(struct strvec *array, const char *fmt, ...)
@@ -37,7 +37,7 @@ const char *strvec_pushf(struct strvec *array, const char *fmt, ...)
        va_end(ap);
 
        strvec_push_nodup(array, strbuf_detach(&v, NULL));
-       return array->argv[array->argc - 1];
+       return array->v[array->nr - 1];
 }
 
 void strvec_pushl(struct strvec *array, ...)
@@ -51,19 +51,19 @@ void strvec_pushl(struct strvec *array, ...)
        va_end(ap);
 }
 
-void strvec_pushv(struct strvec *array, const char **argv)
+void strvec_pushv(struct strvec *array, const char **items)
 {
-       for (; *argv; argv++)
-               strvec_push(array, *argv);
+       for (; *items; items++)
+               strvec_push(array, *items);
 }
 
 void strvec_pop(struct strvec *array)
 {
-       if (!array->argc)
+       if (!array->nr)
                return;
-       free((char *)array->argv[array->argc - 1]);
-       array->argv[array->argc - 1] = NULL;
-       array->argc--;
+       free((char *)array->v[array->nr - 1]);
+       array->v[array->nr - 1] = NULL;
+       array->nr--;
 }
 
 void strvec_split(struct strvec *array, const char *to_split)
@@ -88,21 +88,21 @@ void strvec_split(struct strvec *array, const char *to_split)
 
 void strvec_clear(struct strvec *array)
 {
-       if (array->argv != empty_strvec) {
+       if (array->v != empty_strvec) {
                int i;
-               for (i = 0; i < array->argc; i++)
-                       free((char *)array->argv[i]);
-               free(array->argv);
+               for (i = 0; i < array->nr; i++)
+                       free((char *)array->v[i]);
+               free(array->v);
        }
        strvec_init(array);
 }
 
 const char **strvec_detach(struct strvec *array)
 {
-       if (array->argv == empty_strvec)
+       if (array->v == empty_strvec)
                return xcalloc(1, sizeof(const char *));
        else {
-               const char **ret = array->argv;
+               const char **ret = array->v;
                strvec_init(array);
                return ret;
        }

diff --git a/strvec.h b/strvec.h
index bd35de1ce4683ac63fcd8a59c37427c289457c72..fdcad75b45b33fdc6974fd35c2102ecbcaba31e4 100644 (file)
--- a/strvec.h
+++ b/strvec.h
@@ -2,10 +2,10 @@
 #define STRVEC_H
 
 /**
- * The argv-array API allows one to dynamically build and store
- * NULL-terminated lists.  An argv-array maintains the invariant that the
- * `argv` member always points to a non-NULL array, and that the array is
- * always NULL-terminated at the element pointed to by `argv[argc]`. This
+ * The strvec API allows one to dynamically build and store
+ * NULL-terminated arrays of strings. A strvec maintains the invariant that the
+ * `items` member always points to a non-NULL array, and that the array is
+ * always NULL-terminated at the element pointed to by `items[nr]`. This
  * makes the result suitable for passing to functions expecting to receive
  * argv from main().
  *
@@ -22,15 +22,15 @@ extern const char *empty_strvec[];
 
 /**
  * A single array. This should be initialized by assignment from
- * `STRVEC_INIT`, or by calling `strvec_init`. The `argv`
- * member contains the actual array; the `argc` member contains the
+ * `STRVEC_INIT`, or by calling `strvec_init`. The `items`
+ * member contains the actual array; the `nr` member contains the
  * number of elements in the array, not including the terminating
  * NULL.
  */
 struct strvec {
-       const char **argv;
-       size_t argc;
-       size_t alloc;
+       const char **v;
+       int nr;
+       int alloc;
 };
 
 #define STRVEC_INIT { empty_strvec, 0, 0 }
@@ -78,7 +78,7 @@ void strvec_split(struct strvec *, const char *);
 void strvec_clear(struct strvec *);
 
 /**
- * Disconnect the `argv` member from the `strvec` struct and
+ * Disconnect the `items` member from the `strvec` struct and
  * return it. The caller is responsible for freeing the memory used
  * by the array, and by the strings it references. After detaching,
  * the `strvec` is in a reinitialized state and can be pushed

diff --git a/submodule.c b/submodule.c
index fb96d595b0d2ed77843508d66624cba904465ab3..a52b93a87f8112b2a14c3ea5732dca595c415673 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -269,7 +269,7 @@ int is_submodule_active(struct repository *repo, const char *path)
                        strvec_push(&args, item->string);
                }
 
-               parse_pathspec(&ps, 0, 0, NULL, args.argv);
+               parse_pathspec(&ps, 0, 0, NULL, args.v);
                ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
 
                strvec_clear(&args);
@@ -842,7 +842,7 @@ static void collect_changed_submodules(struct repository *r,
        const struct commit *commit;
 
        repo_init_revisions(r, &rev, NULL);
-       setup_revisions(argv->argc, argv->argv, &rev, NULL);
+       setup_revisions(argv->nr, argv->v, &rev, NULL);
        if (prepare_revision_walk(&rev))
                die(_("revision walk setup failed"));
 
@@ -1014,7 +1014,7 @@ int find_unpushed_submodules(struct repository *r,
        struct string_list_item *name;
        struct strvec argv = STRVEC_INIT;
 
-       /* argv.argv[0] will be ignored by setup_revisions */
+       /* argv.v[0] will be ignored by setup_revisions */
        strvec_push(&argv, "find_unpushed_submodules");
        oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
        strvec_push(&argv, "--not");
@@ -1453,7 +1453,7 @@ static int get_next_submodule(struct child_process *cp,
                                strbuf_addf(err, _("Fetching submodule %s%s\n"),
                                            spf->prefix, ce->name);
                        strvec_init(&cp->args);
-                       strvec_pushv(&cp->args, spf->args.argv);
+                       strvec_pushv(&cp->args, spf->args.v);
                        strvec_push(&cp->args, default_argv);
                        strvec_push(&cp->args, "--submodule-prefix");
 
@@ -1501,7 +1501,7 @@ static int get_next_submodule(struct child_process *cp,
                cp->dir = task->repo->gitdir;
 
                strvec_init(&cp->args);
-               strvec_pushv(&cp->args, spf->args.argv);
+               strvec_pushv(&cp->args, spf->args.v);
                strvec_push(&cp->args, "on-demand");
                strvec_push(&cp->args, "--submodule-prefix");
                strvec_push(&cp->args, submodule_prefix.buf);
@@ -1619,8 +1619,8 @@ int fetch_populated_submodules(struct repository *r,
                die(_("index file corrupt"));
 
        strvec_push(&spf.args, "fetch");
-       for (i = 0; i < options->argc; i++)
-               strvec_push(&spf.args, options->argv[i]);
+       for (i = 0; i < options->nr; i++)
+               strvec_push(&spf.args, options->v[i]);
        strvec_push(&spf.args, "--recurse-submodules-default");
        /* default value, "--submodule-prefix" and its value are added later */
 

diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 726835fcc2e50c9fe5a2dc67880f5a8091ad3449..7ae03dc7123468463d02a28dce2b1c6175576b6f 100644 (file)
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -248,7 +248,7 @@ static int quote_stress_test(int argc, const char **argv)
                else
                        strvec_pushl(&args, "test-tool", "run-command",
                                     "quote-echo", NULL);
-               arg_offset = args.argc;
+               arg_offset = args.nr;
 
                if (argc > 0) {
                        trials = 1;
@@ -275,13 +275,13 @@ static int quote_stress_test(int argc, const char **argv)
                if (i < skip)
                        continue;
 
-               cp.argv = args.argv;
+               cp.argv = args.v;
                strbuf_reset(&out);
                if (pipe_command(&cp, NULL, 0, &out, 0, NULL, 0) < 0)
                        return error("Failed to spawn child process");
 
                for (j = 0, k = 0; j < arg_count; j++) {
-                       const char *arg = args.argv[j + arg_offset];
+                       const char *arg = args.v[j + arg_offset];
 
                        if (strcmp(arg, out.buf + k))
                                ret = error("incorrectly quoted arg: '%s', "
@@ -298,7 +298,7 @@ static int quote_stress_test(int argc, const char **argv)
                        fprintf(stderr, "Trial #%d failed. Arguments:\n", i);
                        for (j = 0; j < arg_count; j++)
                                fprintf(stderr, "arg #%d: '%s'\n",
-                                       (int)j, args.argv[j + arg_offset]);
+                                       (int)j, args.v[j + arg_offset]);
 
                        strbuf_release(&out);
                        strvec_clear(&args);

diff --git a/tmp-objdir.c b/tmp-objdir.c
index e78e481d8ecb6396bad159ce0991c19c80367cc2..42ed4db5d3a54e1dbb2bd2fb56481da28411ca1f 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -283,7 +283,7 @@ const char **tmp_objdir_env(const struct tmp_objdir *t)
 {
        if (!t)
                return NULL;
-       return t->env.argv;
+       return t->env.v;
 }
 
 void tmp_objdir_add_as_alternate(const struct tmp_objdir *t)

diff --git a/transport-helper.c b/transport-helper.c
index ae8011e9d5b7e04bbea96083454dc6e02d49ad4d..defafbf4c1bc6788c4f7b9692cdcfcda1181116b 100644 (file)
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -138,7 +138,7 @@ static struct child_process *get_helper(struct transport *transport)
                strvec_pushf(&helper->env_array, "%s=%s",
                             GIT_DIR_ENVIRONMENT, get_git_dir());
 
-       helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */
+       helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */
 
        code = start_command(helper);
        if (code < 0 && errno == ENOENT)

diff --git a/upload-pack.c b/upload-pack.c
index 4a7918e04e1aeb09d9243f63459148ce6552df49..db8c6509fe9876d21e0b025599b013dfd12cc5ea 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -897,7 +897,7 @@ static int send_shallow_list(struct upload_pack_data *data)
                        struct object *o = data->want_obj.objects[i].item;
                        strvec_push(&av, oid_to_hex(&o->oid));
                }
-               deepen_by_rev_list(data, av.argc, av.argv);
+               deepen_by_rev_list(data, av.nr, av.v);
                strvec_clear(&av);
                ret = 1;
        } else {