On Wed, Apr 25, 2018 at 10:41:18AM +0200, Ævar Arnfjörð Bjarmason wrote:
> 2. Add some config so we can have hook search paths, and ship with a
> default search path for hooks shipped with git.
I would go for something like this instead of search paths. This
allows you to specify a path to any specific hook in hooks.* config
group. This is basically "$GIT_DIR/hooks directory in config file" but
with lower priority than those in $GIT_DIR/hooks.
Now we can do something like
git -c hooks.post-checkout=/path/to/some/script clone ...
but of course I would need to fix the FIXME or this hook config is
only effective just this one time. (And of course you could put it in
~/.gitconfig)
-- 8< --
diff --git a/builtin/clone.c b/builtin/clone.c
index 7df5932b85..143413ed2d 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -1063,6 +1063,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
}
+ /*
+ * FIXME: we should keep all custom config settings via
+ * "git -c ..." in $GIT_DIR/config.
+ */
+
strbuf_addf(&value, "+%s*:%s*", src_ref_prefix, branch_top.buf);
strbuf_addf(&key, "remote.%s.url", option_origin);
git_config_set(key.buf, repo);
diff --git a/run-command.c b/run-command.c
index 84899e423f..ee5b6ea329 100644
--- a/run-command.c
+++ b/run-command.c
@@ -7,6 +7,7 @@
#include "strbuf.h"
#include "string-list.h"
#include "quote.h"
+#include "config.h"
void child_process_init(struct child_process *child)
{
@@ -1256,6 +1257,8 @@ const char *find_hook(const char *name)
strbuf_reset(&path);
strbuf_git_path(&path, "hooks/%s", name);
if (access(path.buf, X_OK) < 0) {
+ const char *cfg_hook;
+ struct strbuf cfg_key = STRBUF_INIT;
int err = errno;
#ifdef STRIP_EXTENSION
@@ -1278,9 +1281,14 @@ const char *find_hook(const char *name)
path.buf);
}
}
- return NULL;
+
+ strbuf_reset(&path);
+ strbuf_addf(&cfg_key, "hooks.%s", name);
+ if (!git_config_get_pathname(cfg_key.buf, &cfg_hook))
+ strbuf_addstr(&path, cfg_hook);
+ strbuf_release(&cfg_key);
}
- return path.buf;
+ return path.len ? path.buf : NULL;
}
int run_hook_ve(const char *const *env, const char *name, va_list args)
-- 8< --
--
Duy
