[PATCH v2 04/12] bisect: simplify building "checkout" argument list
- From
René Scharfe <l.s.r@web.de>
- Date
- Oct 30, 2022, 11:47 UTC
- Message-ID
- <78a5fb6d-4728-e6dc-a3e2-2d38c95ad381@web.de>
- In-Reply-To
- <ea061164-b36b-485c-963f-8c13e813a47e@web.de>
Reduce the scope of argv_checkout, which allows to fully build it during initialization. Use oid_to_hex() instead of oid_to_hex_r(), because that's simpler and using the static buffer of the former is just as safe as the old static argv_checkout.
Signed-off-by: René Scharfe <l.s.r@web.de> --- bisect.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/bisect.c b/bisect.c index fd581b85a7..090aa5c4b4 100644 --- a/bisect.c +++ b/bisect.c @@ -22,8 +22,6 @@ static struct oid_array skipped_revs; static struct object_id *current_bad_oid; -static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL}; - static const char *term_bad; static const char *term_good; @@ -729,19 +727,20 @@ static int is_expected_rev(const struct object_id *oid) enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout) { - char bisect_rev_hex[GIT_MAX_HEXSZ + 1]; struct commit *commit; struct pretty_print_context pp = {0}; struct strbuf commit_msg = STRBUF_INIT; - oid_to_hex_r(bisect_rev_hex, bisect_rev); update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR); - argv_checkout[2] = bisect_rev_hex; if (no_checkout) { 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 + }; + if (run_command_v_opt(argv_checkout, RUN_GIT_CMD)) /* * Errors in `run_command()` itself, signaled by res < 0, -- 2.38.1