[PATCH v8 21/37] gc: use hook library for pre-auto-gc hook
flat view
STALE1829d
From: Emily Shaffer <hidden>
Date: 2021-03-11 02:12:09
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
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 <redacted> --- Documentation/githooks.txt | 3 +++ builtin/gc.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 664ad4803e..00f88912cd 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt@@ -560,6 +560,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 ef7226d7bc..e62cb510ee 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; + run_hooks_opt_init_async(&hook_opt); /* * Setting gc.auto to 0 or negative can disable the * automatic gc.
@@ -394,7 +397,7 @@ static int need_to_gc(void) else return 0; - if (run_hook_le(NULL, "pre-auto-gc", NULL)) + if (run_hooks("pre-auto-gc", &hook_opt)) return 0; return 1; }
--
2.31.0.rc2.261.g7f71774620-goog