[PATCH v6 16/17] receive-pack: convert push-to-checkout hook to hook.h
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Dec 22, 2021, 03:59 UTC
- Message-ID
- <patch-v6-16.17-c47b36ab41a-20211222T035755Z-avarab@gmail.com>
- In-Reply-To
- <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>
From: Emily Shaffer <emilyshaffer@google.com>
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> --- builtin/receive-pack.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 4f92e6f059d..e99b1ecd103 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -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;
-- 2.34.1.1146.gb52885e7c44