diff options
author | René Scharfe <l.s.r@web.de> | 2022-10-30 14:55:06 +0300 |
---|---|---|
committer | Taylor Blau <me@ttaylorr.com> | 2022-10-30 21:04:51 +0300 |
commit | ddbb47fde9b6d8cd9f3728847a378f634318cfb1 (patch) | |
tree | ef093554b4ce4914edb7a0a0ace39187347bb344 /bisect.c | |
parent | ef249b398e26dd76f473ce83a35219c520f6fdbe (diff) |
replace and remove run_command_v_opt()
Replace the remaining calls of run_command_v_opt() with run_command()
calls and explict struct child_process variables. This is more verbose,
but not by much overall. The code becomes more flexible, e.g. it's easy
to extend to conditionally add a new argument.
Then remove the now unused function and its own flag names, simplifying
the run-command API.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'bisect.c')
-rw-r--r-- | bisect.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -737,11 +737,12 @@ enum bisect_error bisect_checkout(const struct object_id *bisect_rev, update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); } else { - const char *argv_checkout[] = { - "checkout", "-q", oid_to_hex(bisect_rev), "--", NULL - }; + struct child_process cmd = CHILD_PROCESS_INIT; - if (run_command_v_opt(argv_checkout, RUN_GIT_CMD)) + cmd.git_cmd = 1; + strvec_pushl(&cmd.args, "checkout", "-q", + oid_to_hex(bisect_rev), "--", NULL); + if (run_command(&cmd)) /* * Errors in `run_command()` itself, signaled by res < 0, * and errors in the child process, signaled by res > 0 |