From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Aug 2020 17:23:57 +0000 (-0700)
Subject: Merge branch 'jk/strvec'
X-Git-Tag: v2.29.0-rc0~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46b225f15308c8f77379f864189bed95c273d29f;p=thirdparty%2Fgit.git

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
---

46b225f15308c8f77379f864189bed95c273d29f
diff --cc builtin/bisect--helper.c
index 73f9324ad7,b46de0489e..d19300687f
--- a/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);