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@xxxxxxxxxx>
---
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;
}
--
2.31.1.818.g46aad6cb9e-goog
