diff mbox series

[v5,13/36] merge: convert post-merge to use hook.h

Message ID	patch-v5-13.36-53d8721a0e3-20210902T125110Z-avarab@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= <avarab@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Emily Shaffer <emilyshaffer@google.com>, Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>, Felipe Contreras <felipe.contreras@gmail.com>, Eric Sunshine <sunshine@sunshineco.com>, "brian m . carlson" <sandals@crustytoothpaste.net>, Josh Steadmon <steadmon@google.com>, Jonathan Tan <jonathantanmy@google.com>, Derrick Stolee <stolee@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFy?= =?utf-8?b?bWFzb24=?= <avarab@gmail.com> Subject: [PATCH v5 13/36] merge: convert post-merge to use hook.h Date: Thu, 2 Sep 2021 15:11:13 +0200 Message-Id: <patch-v5-13.36-53d8721a0e3-20210902T125110Z-avarab@gmail.com> In-Reply-To: <cover-v5-00.36-00000000000-20210902T125110Z-avarab@gmail.com> References: <cover-v4-00.36-00000000000-20210803T191505Z-avarab@gmail.com> <cover-v5-00.36-00000000000-20210902T125110Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Run hooks via "git run hook" & hook library \| expand [v5,00/36] Run hooks via "git run hook" & hook library [v5,01/36] Makefile: mark "check" target as .PHONY [v5,02/36] Makefile: stop hardcoding {command,config}-list.h [v5,03/36] Makefile: remove an out-of-date comment [v5,04/36] hook.[ch]: move find_hook() from run-command.c to hook.c [v5,05/36] hook.c: add a hook_exists() wrapper and use it in bugreport.c [v5,06/36] hook.c users: use "hook_exists()" instead of "find_hook()" [v5,07/36] hook-list.h: add a generated list of hooks, like config-list.h [v5,08/36] hook: add 'run' subcommand [v5,09/36] gc: use hook library for pre-auto-gc hook [v5,10/36] rebase: convert pre-rebase to use hook.h [v5,11/36] am: convert applypatch to use hook.h [v5,12/36] hooks: convert 'post-checkout' hook to hook library [v5,13/36] merge: convert post-merge to use hook.h [v5,14/36] git hook run: add an --ignore-missing flag [v5,15/36] send-email: use 'git hook run' for 'sendemail-validate' [v5,16/36] git-p4: use 'git hook' to run hooks [v5,17/36] commit: convert {pre-commit,prepare-commit-msg} hook to hook.h [v5,18/36] read-cache: convert post-index-change to use hook.h [v5,19/36] receive-pack: convert push-to-checkout hook to hook.h [v5,20/36] run-command: remove old run_hook_{le,ve}() hook API [v5,21/36] run-command: allow stdin for run_processes_parallel [v5,22/36] hook: support passing stdin to hooks [v5,23/36] am: convert 'post-rewrite' hook to hook.h [v5,24/36] run-command: add stdin callback for parallelization [v5,25/36] hook: provide stdin by string_list or callback [v5,26/36] hook: convert 'post-rewrite' hook in sequencer.c to hook.h [v5,27/36] transport: convert pre-push hook to hook.h [v5,28/36] hook tests: test for exact "pre-push" hook input [v5,29/36] hook tests: use a modern style for "pre-push" tests [v5,30/36] reference-transaction: use hook.h to run hooks [v5,31/36] run-command: allow capturing of collated output [v5,32/36] hooks: allow callers to capture output [v5,33/36] receive-pack: convert 'update' hook to hook.h [v5,34/36] post-update: use hook.h library [v5,35/36] receive-pack: convert receive hooks to hook.h [v5,36/36] hooks: fix a TOCTOU in "did we run a hook?" heuristic

Commit Message

Ævar Arnfjörð Bjarmason Sept. 2, 2021, 1:11 p.m. UTC

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 mbox series

Patch

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);