Merge branch 'jk/strvec'

The argv_array API is useful for not just managing argv but any
"vector" (NULL-terminated array) of strings, and has seen adoption
to a certain degree.  It has been renamed to "strvec" to reduce the
barrier to adoption.

* jk/strvec:
  strvec: rename struct fields
  strvec: drop argv_array compatibility layer
  strvec: update documention to avoid argv_array
  strvec: fix indentation in renamed calls
  strvec: convert remaining callers away from argv_array name
  strvec: convert more callers away from argv_array name
  strvec: convert builtin/ callers away from argv_array name
  quote: rename sq_dequote_to_argv_array to mention strvec
  strvec: rename files from argv-array to strvec
  argv-array: rename to strvec
  argv-array: use size_t for count and alloc

diff --cc add-patch.c
Simple merge

diff --cc builtin/bisect--helper.c
index 73f9324ad7d150b3489c65edd10d52a9e309f73e,b46de0489e5583688c2c8111abf09c53e12170f3..d19300687fe9dff04c5af08de8a63cce15e46f98
--- 1/builtin/bisect--helper.c
--- 2/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@@ -163,11 -164,11 +163,11 @@@ static int bisect_reset(const char *com
                strbuf_addstr(&branch, commit);
        }
  
 -      if (!file_exists(git_path_bisect_head())) {
 +      if (!ref_exists("BISECT_HEAD")) {
-               struct argv_array argv = ARGV_ARRAY_INIT;
+               struct strvec argv = STRVEC_INIT;
  
-               argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
-               if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+               strvec_pushl(&argv, "checkout", branch.buf, "--", NULL);
+               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);

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc column.c
Simple merge

diff --cc fsmonitor.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc remote-curl.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc sha1-file.c
Simple merge

diff --cc upload-pack.c
Simple merge

diff --cc wt-status.c
Simple merge