diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-11-26 01:52:21 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-11-26 09:15:07 +0300 |
commit | 7f14609e296d5737f34607d4c3e40bb1b063ef04 (patch) | |
tree | 30f74227a1ee7a7b2d5c0570a2a72dc4afaccc21 /transport.c | |
parent | 2b7098936c9e91d527aa53b8d4af0b25d7e912b4 (diff) |
run-command API users: use strvec_push(), not argv construction
Change a pattern of hardcoding an "argv" array size, populating it and
assigning to the "argv" member of "struct child_process" to instead
use "strvec_push()" to add data to the "args" member.
As noted in the preceding commit this moves us further towards being
able to remove the "argv" member in a subsequent commit
These callers could have used strvec_pushl(), but moving to
strvec_push() makes the diff easier to read, and keeps the arguments
aligned as before.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'transport.c')
-rw-r--r-- | transport.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/transport.c b/transport.c index e4f1decae2..92ab9a3fa6 100644 --- a/transport.c +++ b/transport.c @@ -1204,16 +1204,15 @@ static int run_pre_push_hook(struct transport *transport, struct ref *r; struct child_process proc = CHILD_PROCESS_INIT; struct strbuf buf; - const char *argv[4]; + const char *hook_path = find_hook("pre-push"); - if (!(argv[0] = find_hook("pre-push"))) + if (!hook_path) return 0; - argv[1] = transport->remote->name; - argv[2] = transport->url; - argv[3] = NULL; + strvec_push(&proc.args, hook_path); + strvec_push(&proc.args, transport->remote->name); + strvec_push(&proc.args, transport->url); - proc.argv = argv; proc.in = -1; proc.trace2_hook_name = "pre-push"; |