]> git.ipfire.org Git - thirdparty/git.git/commitdiff
receive-pack: convert push-to-checkout hook to hook.h
authorEmily Shaffer <emilyshaffer@google.com>
Wed, 22 Dec 2021 03:59:42 +0000 (04:59 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jan 2022 23:19:35 +0000 (15:19 -0800)
Move the push-to-checkout hook away from run-command.h to and over to
the new hook.h library.

This removes the last direct user of run_hook_le(), so we could remove
that function now, but let's leave that to a follow-up cleanup commit.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/receive-pack.c

index 4f92e6f059dcb3f6668ca9973dfee9f149ffbb27..e99b1ecd103f41d8bed551040c1c03df4a880252 100644 (file)
@@ -1424,9 +1424,12 @@ static const char *push_to_checkout(unsigned char *hash,
                                    struct strvec *env,
                                    const char *work_tree)
 {
+       struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
+
        strvec_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
-       if (run_hook_le(env->v, push_to_checkout_hook,
-                       hash_to_hex(hash), NULL))
+       strvec_pushv(&opt.env, env->v);
+       strvec_push(&opt.args, hash_to_hex(hash));
+       if (run_hooks_opt(push_to_checkout_hook, &opt))
                return "push-to-checkout hook declined";
        else
                return NULL;