[PATCH 00/13] hook.[ch]: new library to run hooks + simple hook conversion · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 01/13] hook: add 'run' subcommand · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
Re: [PATCH 01/13] hook: add 'run' subcommand · René Scharfe <hidden> · 2021-10-12
Re: [PATCH 01/13] hook: add 'run' subcommand · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-13
Re: [PATCH 01/13] hook: add 'run' subcommand · Bagas Sanjaya <hidden> · 2021-10-13
Re: [PATCH 01/13] hook: add 'run' subcommand · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-13
[PATCH 02/13] gc: use hook library for pre-auto-gc hook · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 03/13] rebase: convert pre-rebase to use hook.h · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 04/13] am: convert applypatch to use hook.h · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 05/13] hooks: convert 'post-checkout' hook to hook library · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 06/13] merge: convert post-merge to use hook.h · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 09/13] git-p4: use 'git hook' to run hooks · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 07/13] git hook run: add an --ignore-missing flag · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 10/13] commit: convert {pre-commit,prepare-commit-msg} hook to hook.h · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 12/13] receive-pack: convert push-to-checkout hook to hook.h · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 11/13] read-cache: convert post-index-change to use hook.h · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 13/13] run-command: remove old run_hook_{le,ve}() hook API · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12
[PATCH 08/13] send-email: use 'git hook run' for 'sendemail-validate' · Ævar Arnfjörð Bjarmason <hidden> · 2021-10-12

STALE1792d

Revision v1 of 6 in this series.

Revisions (6)

2021-10-12 v1 current
2021-10-15 v2 [diff vs current]
2021-10-19 v3 [diff vs current]
2021-11-01 v4 [diff vs current]
2021-11-23 v5 [diff vs current]
2021-12-22 v6 [diff vs current]

[PATCH 06/13] merge: convert post-merge to use hook.h

From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-10-12 13:31:20
Subsystem: the rest · Maintainer: Linus Torvalds

From: Emily Shaffer <redacted>

Teach post-merge to use the hook.h library instead of the
run-command.h library to run hooks.

Signed-off-by: Emily Shaffer <redacted>
Signed-off-by: Ævar Arnfjörð Bjarmason <redacted>
---
 builtin/merge.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index 956b6259f21..167d13bd737 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)

@@ -488,7 +489,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.1567.g7b23ce7ed9e