On Tue, Oct 12, 2021 at 03:30:29PM +0200, Ævar Arnfjörð Bjarmason wrote:
>
>
> Teach pre-applypatch, post-applypatch, and applypatch-msg to use the
> hook.h library instead of the run-command.h library.
>
> Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
Reviewed-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
> ---
> builtin/am.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/am.c b/builtin/am.c
> index 3527945a467..2cfe6451b6f 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -446,9 +446,11 @@ static void am_destroy(const struct am_state *state)
> static int run_applypatch_msg_hook(struct am_state *state)
> {
> int ret;
> + struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
>
> assert(state->msg);
> - ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
> + strvec_push(&opt.args, am_path(state, "final-commit"));
> + ret = run_hooks_oneshot("applypatch-msg", &opt);
>
> if (!ret) {
> FREE_AND_NULL(state->msg);
> @@ -1609,7 +1611,7 @@ static void do_commit(const struct am_state *state)
> const char *reflog_msg, *author, *committer = NULL;
> struct strbuf sb = STRBUF_INIT;
>
> - if (run_hook_le(NULL, "pre-applypatch", NULL))
> + if (run_hooks_oneshot("pre-applypatch", NULL))
> exit(1);
>
> if (write_cache_as_tree(&tree, 0, NULL))
> @@ -1661,7 +1663,7 @@ static void do_commit(const struct am_state *state)
> fclose(fp);
> }
>
> - run_hook_le(NULL, "post-applypatch", NULL);
> + run_hooks_oneshot("post-applypatch", NULL);
>
> strbuf_release(&sb);
> }
> --
> 2.33.0.1567.g7b23ce7ed9e
>
