[v9,20/37] gc: use hook library for pre-auto-gc hook

Message ID	20210527000856.695702-21-emilyshaffer@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Wed, 26 May 2021 17:08:39 -0700 In-Reply-To: <20210527000856.695702-1-emilyshaffer@google.com> Message-Id: <20210527000856.695702-21-emilyshaffer@google.com> Mime-Version: 1.0 References: <20210527000856.695702-1-emilyshaffer@google.com> Subject: [PATCH v9 20/37] gc: use hook library for pre-auto-gc hook 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-21-emilyshaffer@google.com (mailing list archive)

State

New, archived

Headers

Date: Wed, 26 May 2021 17:08:39 -0700
In-Reply-To: <20210527000856.695702-1-emilyshaffer@google.com>
Message-Id: <20210527000856.695702-21-emilyshaffer@google.com>
Mime-Version: 1.0
References: <20210527000856.695702-1-emilyshaffer@google.com>
Subject: [PATCH v9 20/37] gc: use hook library for pre-auto-gc hook
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

Using the hook.h library instead of the run-command.h library to run
pre-auto-gc means that those hooks can be set up in config files, as
well as in the hookdir. pre-auto-gc is called only from builtin/gc.c.

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

diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index c904b160dc..d77170dafb 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -569,6 +569,9 @@  This hook is invoked by `git gc --auto` (see linkgit:git-gc[1]). It
 takes no parameter, and exiting with non-zero status from this script
 causes the `git gc --auto` to abort.
 
+Hooks run during 'pre-auto-gc' will be run in parallel, unless hook.jobs is
+configured to 1.
+
 post-rewrite
 ~~~~~~~~~~~~
 
diff --git a/builtin/gc.c b/builtin/gc.c
index f05d2f0a1a..16890b097c 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -32,6 +32,7 @@ 
 #include "remote.h"
 #include "object-store.h"
 #include "exec-cmd.h"
+#include "hook.h"
 
 #define FAILED_RUN "failed to run %s"
 
@@ -348,6 +349,8 @@  static void add_repack_incremental_option(void)
 
 static int need_to_gc(void)
 {
+	struct run_hooks_opt hook_opt;
+
 	/*
 	 * Setting gc.auto to 0 or negative can disable the
 	 * automatic gc.
@@ -394,8 +397,12 @@  static int need_to_gc(void)
 	else
 		return 0;
 
-	if (run_hook_le(NULL, "pre-auto-gc", NULL))
+	run_hooks_opt_init_async(&hook_opt);
+	if (run_hooks("pre-auto-gc", &hook_opt)) {
+		run_hooks_opt_clear(&hook_opt);
 		return 0;
+	}
+	run_hooks_opt_clear(&hook_opt);
 	return 1;
 }

[v9,20/37] gc: use hook library for pre-auto-gc hook

Commit Message

Patch