[v4,08/17] merge: convert post-merge to use hook.h

Message ID	patch-v4-08.17-2c23e8645ec-20211101T184938Z-avarab@gmail.com (mailing list archive)
State	Superseded
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>, Phillip Wood <phillip.wood123@gmail.com>, =?utf-8?q?Ren=C3=A9_Scharfe?= <l.s.r@web.de>, Emily Shaffer <emilyshaffer@google.com>, Bagas Sanjaya <bagasdotme@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= <avarab@gmail.com> Subject: [PATCH v4 08/17] merge: convert post-merge to use hook.h Date: Mon, 1 Nov 2021 19:56:13 +0100 Message-Id: <patch-v4-08.17-2c23e8645ec-20211101T184938Z-avarab@gmail.com> In-Reply-To: <cover-v4-00.17-00000000000-20211101T184938Z-avarab@gmail.com> References: <cover-v3-00.13-00000000000-20211019T231647Z-avarab@gmail.com> <cover-v4-00.17-00000000000-20211101T184938Z-avarab@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	hook.[ch]: new library to run hooks + simple hook conversion \| expand [v4,00/17] hook.[ch]: new library to run hooks + simple hook conversion [v4,01/17] hook: add 'run' subcommand [v4,02/17] hook API: add a run_hooks() wrapper [v4,03/17] gc: use hook library for pre-auto-gc hook [v4,04/17] am: convert {pre,post}-applypatch to use hook.h [v4,05/17] hook API: add a run_hooks_l() wrapper [v4,06/17] rebase: convert pre-rebase to use hook.h [v4,07/17] am: convert applypatch-msg to use hook.h [v4,08/17] merge: convert post-merge to use hook.h [v4,09/17] hooks: convert non-worktree 'post-checkout' hook to hook library [v4,10/17] hooks: convert worktree 'post-checkout' hook to hook library [v4,11/17] git hook run: add an --ignore-missing flag [v4,12/17] send-email: use 'git hook run' for 'sendemail-validate' [v4,13/17] git-p4: use 'git hook' to run hooks [v4,14/17] commit: convert {pre-commit,prepare-commit-msg} hook to hook.h [v4,15/17] read-cache: convert post-index-change to use hook.h [v4,16/17] receive-pack: convert push-to-checkout hook to hook.h [v4,17/17] run-command: remove old run_hook_{le,ve}() hook API

Message ID

patch-v4-08.17-2c23e8645ec-20211101T184938Z-avarab@gmail.com (mailing list archive)

State

Superseded

Headers

From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?=  <avarab@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
 Phillip Wood <phillip.wood123@gmail.com>,
 =?utf-8?q?Ren=C3=A9_Scharfe?= <l.s.r@web.de>,
 Emily Shaffer <emilyshaffer@google.com>,
 Bagas Sanjaya <bagasdotme@gmail.com>, =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?=
	=?utf-8?b?amFybWFzb24=?=  <avarab@gmail.com>
Subject: [PATCH v4 08/17] merge: convert post-merge to use hook.h
Date: Mon,  1 Nov 2021 19:56:13 +0100
Message-Id: <patch-v4-08.17-2c23e8645ec-20211101T184938Z-avarab@gmail.com>
In-Reply-To: <cover-v4-00.17-00000000000-20211101T184938Z-avarab@gmail.com>
References: <cover-v3-00.13-00000000000-20211019T231647Z-avarab@gmail.com>
 <cover-v4-00.17-00000000000-20211101T184938Z-avarab@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

hook.[ch]: new library to run hooks + simple hook conversion | expand

Commit Message

Ævar Arnfjörð Bjarmason Nov. 1, 2021, 6:56 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/merge.c b/builtin/merge.c
index ea3112e0c0b..e6facd1c95d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -488,7 +488,7 @@  static void finish(struct commit *head_commit,
 	}
 
 	/* Run a post-merge hook */
-	run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
+	run_hooks_l("post-merge", squash ? "1" : "0", NULL);
 
 	apply_autostash(git_path_merge_autostash(the_repository));
 	strbuf_release(&reflog_message);

[v4,08/17] merge: convert post-merge to use hook.h

Commit Message

Patch