[v9,21/37] rebase: teach pre-rebase to use hook.h

Message ID	20210527000856.695702-22-emilyshaffer@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Wed, 26 May 2021 17:08:40 -0700 In-Reply-To: <20210527000856.695702-1-emilyshaffer@google.com> Message-Id: <20210527000856.695702-22-emilyshaffer@google.com> Mime-Version: 1.0 References: <20210527000856.695702-1-emilyshaffer@google.com> Subject: [PATCH v9 21/37] rebase: teach pre-rebase to use hook.h From: Emily Shaffer <emilyshaffer@google.com> To: git@vger.kernel.org Cc: Emily Shaffer <emilyshaffer@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	propose config-based hooks \| expand [v9,00/37] propose config-based hooks [v9,01/37] doc: propose hooks managed by the config [v9,02/37] hook: introduce git-hook subcommand [v9,03/37] hook: include hookdir hook in list [v9,04/37] hook: teach hook.runHookDir [v9,05/37] hook: implement hookcmd.<name>.skip [v9,06/37] parse-options: parse into strvec [v9,07/37] hook: add 'run' subcommand [v9,08/37] hook: introduce hook_exists() [v9,09/37] hook: support passing stdin to hooks [v9,10/37] run-command: allow stdin for run_processes_parallel [v9,11/37] hook: allow parallel hook execution [v9,12/37] hook: allow specifying working directory for hooks [v9,13/37] run-command: add stdin callback for parallelization [v9,14/37] hook: provide stdin by string_list or callback [v9,15/37] run-command: allow capturing of collated output [v9,16/37] hooks: allow callers to capture output [v9,17/37] commit: use config-based hooks [v9,18/37] am: convert applypatch hooks to use config [v9,19/37] merge: use config-based hooks for post-merge hook [v9,20/37] gc: use hook library for pre-auto-gc hook [v9,21/37] rebase: teach pre-rebase to use hook.h [v9,22/37] read-cache: convert post-index-change hook to use config [v9,23/37] receive-pack: convert push-to-checkout hook to hook.h [v9,24/37] git-p4: use 'git hook' to run hooks [v9,25/37] hooks: convert 'post-checkout' hook to hook library [v9,26/37] hook: convert 'post-rewrite' hook to config [v9,27/37] transport: convert pre-push hook to use config [v9,28/37] reference-transaction: look for hooks in config [v9,29/37] receive-pack: convert 'update' hook to hook.h [v9,30/37] proc-receive: acquire hook list from hook.h [v9,31/37] post-update: use hook.h library [v9,32/37] receive-pack: convert receive hooks to hook.h [v9,33/37] bugreport: use hook_exists instead of find_hook [v9,34/37] git-send-email: use 'git hook run' for 'sendemail-validate' [v9,35/37] run-command: stop thinking about hooks [v9,36/37] doc: clarify fsmonitor-watchman specification [v9,37/37] docs: link githooks and git-hook manpages

Message ID

20210527000856.695702-22-emilyshaffer@google.com (mailing list archive)

State

New, archived

Headers

Date: Wed, 26 May 2021 17:08:40 -0700
In-Reply-To: <20210527000856.695702-1-emilyshaffer@google.com>
Message-Id: <20210527000856.695702-22-emilyshaffer@google.com>
Mime-Version: 1.0
References: <20210527000856.695702-1-emilyshaffer@google.com>
Subject: [PATCH v9 21/37] rebase: teach pre-rebase to use hook.h
From: Emily Shaffer <emilyshaffer@google.com>
To: git@vger.kernel.org
Cc: Emily Shaffer <emilyshaffer@google.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

Series

propose config-based hooks | expand

Commit Message

Emily Shaffer May 27, 2021, 12:08 a.m. UTC

By using hook.h instead of run-command.h to run hooks, pre-rebase hooks
can now be specified in the config as well as in the hookdir. pre-rebase
is not called anywhere besides builtin/rebase.c.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
---
 Documentation/githooks.txt |  3 +++
 builtin/rebase.c           | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index d77170dafb..7ae24d65ec 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -206,6 +206,9 @@  two parameters.  The first parameter is the upstream from which
 the series was forked.  The second parameter is the branch being
 rebased, and is not set when rebasing the current branch.
 
+Hooks executed during 'pre-rebase' will run in parallel, unless hook.jobs is
+configured to 1.
+
 post-checkout
 ~~~~~~~~~~~~~
 
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 12f093121d..fe9f144cad 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -28,6 +28,7 @@ 
 #include "sequencer.h"
 #include "rebase-interactive.h"
 #include "reset.h"
+#include "hook.h"
 
 #define DEFAULT_REFLOG_ACTION "rebase"
 
@@ -1313,6 +1314,7 @@  int cmd_rebase(int argc, const char **argv, const char *prefix)
 	char *squash_onto_name = NULL;
 	int reschedule_failed_exec = -1;
 	int allow_preemptive_ff = 1;
+	struct run_hooks_opt hook_opt;
 	struct option builtin_rebase_options[] = {
 		OPT_STRING(0, "onto", &options.onto_name,
 			   N_("revision"),
@@ -2022,10 +2024,14 @@  int cmd_rebase(int argc, const char **argv, const char *prefix)
 	}
 
 	/* If a hook exists, give it a chance to interrupt*/
+	run_hooks_opt_init_async(&hook_opt);
+	strvec_pushl(&hook_opt.args, options.upstream_arg, argc ? argv[0] : NULL, NULL);
 	if (!ok_to_skip_pre_rebase &&
-	    run_hook_le(NULL, "pre-rebase", options.upstream_arg,
-			argc ? argv[0] : NULL, NULL))
+	    run_hooks("pre-rebase", &hook_opt)) {
+		run_hooks_opt_clear(&hook_opt);
 		die(_("The pre-rebase hook refused to rebase."));
+	}
+	run_hooks_opt_clear(&hook_opt);
 
 	if (options.flags & REBASE_DIFFSTAT) {
 		struct diff_options opts;

[v9,21/37] rebase: teach pre-rebase to use hook.h

Commit Message

Patch