As the hook architecture and 'git hook run' become more featureful, we
may find wrappers wanting to use the hook architecture to run their own
hooks, thereby getting nice things like parallelism and idiomatic Git
configuration for free. Enable this by letting 'git hook run' bypass the
known_hooks() check.
We do still want to keep known_hooks() around, though - by die()ing when
an internal Git call asks for run_hooks("my-new-hook"), we can remind
Git developers to update Documentation/githooks.txt with their new hook,
which in turn helps Git users discover this new hook.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
---
builtin/hook.c | 4 ++--
hook.c | 32 ++++++++++++++++++++++++++++----
hook.h | 16 +++++++++++++++-
3 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/builtin/hook.c b/builtin/hook.c
index 8340c8c9a8..b08f9c9c4f 100644
--- a/builtin/hook.c
+++ b/builtin/hook.c
@@ -39,7 +39,7 @@ static int list(int argc, const char **argv, const char *prefix)
hookname = argv[0];
- head = hook_list(hookname);
+ head = hook_list(hookname, 1);
if (list_empty(head)) {
printf(_("no commands configured for hook '%s'\n"),
@@ -103,7 +103,7 @@ static int run(int argc, const char **argv, const char *prefix)
* run_found_hooks() instead...
*/
hook_name = argv[0];
- hooks = hook_list(hook_name);
+ hooks = hook_list(hook_name, 1);
if (list_empty(hooks)) {
/* ... act like run_hooks() under --ignore-missing */
if (ignore_missing)
diff --git a/hook.c b/hook.c
index 3a588cb055..e1cf035022 100644
--- a/hook.c
+++ b/hook.c
@@ -52,12 +52,21 @@ static int known_hook(const char *name)
const char *find_hook(const char *name)
{
- static struct strbuf path = STRBUF_INIT;
+ const char *hook_path;
if (!known_hook(name))
die(_("the hook '%s' is not known to git, should be in hook-list.h via githooks(5)"),
name);
+ hook_path = find_hook_gently(name);
+
+ return hook_path;
+}
+
+const char *find_hook_gently(const char *name)
+{
+ static struct strbuf path = STRBUF_INIT;
+
strbuf_reset(&path);
strbuf_git_path(&path, "hooks/%s", name);
if (access(path.buf, X_OK) < 0) {
@@ -101,10 +110,16 @@ int hook_exists(const char *name)
return !!find_hook(name);
}
-struct list_head* hook_list(const char* hookname)
+struct hook_config_cb
+{
+ struct strbuf *hook_key;
+ struct list_head *list;
+};
+
+struct list_head* hook_list(const char* hookname, int allow_unknown)
{
struct list_head *hook_head = xmalloc(sizeof(struct list_head));
- const char *hook_path = find_hook(hookname);
+ const char *hook_path;
INIT_LIST_HEAD(hook_head);
@@ -112,6 +127,11 @@ struct list_head* hook_list(const char* hookname)
if (!hookname)
return NULL;
+ if (allow_unknown)
+ hook_path = find_hook_gently(hookname);
+ else
+ hook_path = find_hook(hookname);
+
/* Add the hook from the hookdir */
if (hook_path) {
struct hook *to_add = xmalloc(sizeof(*to_add));
@@ -291,7 +311,11 @@ int run_hooks(const char *hook_name, struct run_hooks_opt *options)
if (options->path_to_stdin && options->feed_pipe)
BUG("choose only one method to populate stdin");
- hooks = hook_list(hook_name);
+ /*
+ * 'git hooks run <hookname>' uses run_found_hooks, so we don't need to
+ * allow unknown hooknames here.
+ */
+ hooks = hook_list(hook_name, 0);
/*
* If you need to act on a missing hook, use run_found_hooks()
diff --git a/hook.h b/hook.h
index 60389cd8cd..2559232880 100644
--- a/hook.h
+++ b/hook.h
@@ -9,8 +9,16 @@
* Returns the path to the hook file, or NULL if the hook is missing
* or disabled. Note that this points to static storage that will be
* overwritten by further calls to find_hook and run_hook_*.
+ *
+ * If the hook is not a native hook (e.g. present in Documentation/githooks.txt)
+ * find_hook() will die(). find_hook_gently() does not consult the native hook
+ * list and will check for any hook name in the hooks directory regardless of
+ * whether it is known. find_hook() should be used by internal calls to hooks,
+ * and find_hook_gently() should only be used when the hookname was provided by
+ * the user, such as by 'git hook run my-wrapper-hook'.
*/
const char *find_hook(const char *name);
+const char *find_hook_gently(const char *name);
/*
* A boolean version of find_hook()
@@ -34,8 +42,14 @@ struct hook {
/*
* Provides a linked list of 'struct hook' detailing commands which should run
* in response to the 'hookname' event, in execution order.
+ *
+ * If allow_unknown is unset, hooks will be checked against the hook list
+ * generated from Documentation/githooks.txt. Otherwise, any hook name will be
+ * allowed. allow_unknown should only be set when the hook name is provided by
+ * the user; internal calls to hook_list should make sure the hook they are
+ * invoking is present in Documentation/githooks.txt.
*/
-struct list_head* hook_list(const char *hookname);
+struct list_head* hook_list(const char *hookname, int allow_unknown);
/* Provides the number of threads to use for parallel hook execution. */
int configured_hook_jobs(void);
--
2.32.0.402.g57bb445576-goog
