[PATCH v5 13/36] merge: convert post-merge to use hook.h
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Sep 2, 2021, 13:11 UTC
- Message-ID
- <patch-v5-13.36-53d8721a0e3-20210902T125110Z-avarab@gmail.com>
- In-Reply-To
- <cover-v5-00.36-00000000000-20210902T125110Z-avarab@gmail.com>
From: Emily Shaffer <emilyshaffer@google.com>
Teach post-merge to use the hook.h library instead of the run-command.h library to run hooks.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/merge.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c index d75a438298b..ca9b3ba4827 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -448,6 +448,7 @@ static void finish(struct commit *head_commit, const struct object_id *new_head, const char *msg) { struct strbuf reflog_message = STRBUF_INIT; + struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT; const struct object_id *head = &head_commit->object.oid; if (!msg) @@ -489,7 +490,8 @@ static void finish(struct commit *head_commit, } /* Run a post-merge hook */ - run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL); + strvec_push(&opt.args, squash ? "1" : "0"); + run_hooks_oneshot("post-merge", &opt); apply_autostash(git_path_merge_autostash(the_repository)); strbuf_release(&reflog_message);
-- 2.33.0.816.g1ba32acadee