[06/27] merge: use config-based hooks for post-merge hook

Message ID	patch-06.27-e9fa3f6759-20210617T101217Z-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 06/27] merge: use config-based hooks for post-merge hook Date: Thu, 17 Jun 2021 12:22:40 +0200 Message-Id: <patch-06.27-e9fa3f6759-20210617T101217Z-avarab@gmail.com> In-Reply-To: <cover-00.27-0000000000-20210617T101216Z-avarab@gmail.com> References: <cover-00.30-00000000000-20210614T101920Z-avarab@gmail.com> <cover-00.27-0000000000-20210617T101216Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Base for "config-based-hooks" \| expand [00/27] Base for "config-based-hooks" [01/27] hook: add 'run' subcommand [02/27] gc: use hook library for pre-auto-gc hook [03/27] rebase: teach pre-rebase to use hook.h [04/27] am: convert applypatch hooks to use config [05/27] hooks: convert 'post-checkout' hook to hook library [06/27] merge: use config-based hooks for post-merge hook [07/27] git hook run: add an --ignore-missing flag [08/27] send-email: use 'git hook run' for 'sendemail-validate' [09/27] git-p4: use 'git hook' to run hooks [10/27] commit: use hook.h to execute hooks [11/27] read-cache: convert post-index-change hook to use config [12/27] receive-pack: convert push-to-checkout hook to hook.h [13/27] run-command: remove old run_hook_{le,ve}() hook API [14/27] run-command: allow stdin for run_processes_parallel [15/27] hook: support passing stdin to hooks [16/27] am: convert 'post-rewrite' hook to hook.h [17/27] run-command: add stdin callback for parallelization [18/27] hook: provide stdin by string_list or callback [19/27] hook: convert 'post-rewrite' hook in sequencer.c to hook.h [20/27] transport: convert pre-push hook to use config [21/27] reference-transaction: use hook.h to run hooks [22/27] run-command: allow capturing of collated output [23/27] hooks: allow callers to capture output [24/27] receive-pack: convert 'update' hook to hook.h [25/27] post-update: use hook.h library [26/27] receive-pack: convert receive hooks to hook.h [27/27] hooks: fix a TOCTOU in "did we run a hook?" heuristic

Message ID

patch-06.27-e9fa3f6759-20210617T101217Z-avarab@gmail.com (mailing list archive)

State

New, archived

Headers

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 06/27] merge: use config-based hooks for post-merge hook
Date: Thu, 17 Jun 2021 12:22:40 +0200
Message-Id: <patch-06.27-e9fa3f6759-20210617T101217Z-avarab@gmail.com>
In-Reply-To: <cover-00.27-0000000000-20210617T101216Z-avarab@gmail.com>
References: <cover-00.30-00000000000-20210614T101920Z-avarab@gmail.com>
 <cover-00.27-0000000000-20210617T101216Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Base for "config-based-hooks" | expand

Commit Message

Ævar Arnfjörð Bjarmason June 17, 2021, 10:22 a.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. This means that post-merge hooks can come from the
config as well as from the hookdir. post-merge is invoked only from
builtin/merge.c.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/merge.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index be98d66b0a..6128b60942 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,9 @@  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("post-merge", &opt);
+	run_hooks_opt_clear(&opt);
 
 	apply_autostash(git_path_merge_autostash(the_repository));
 	strbuf_release(&reflog_message);
@@ -849,7 +852,7 @@  static void prepare_to_commit(struct commit_list *remoteheads)
 	 * and write it out as a tree.  We must do this before we invoke
 	 * the editor and after we invoke run_status above.
 	 */
-	if (find_hook("pre-merge-commit"))
+	if (hook_exists("pre-merge-commit"))
 		discard_cache();
 	read_cache_from(index_file);
 	strbuf_addbuf(&msg, &merge_msg);

[06/27] merge: use config-based hooks for post-merge hook

Commit Message

Patch