summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:17 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:17 -0700
commit6675f501f6b987dbdb0dbeb1d2efeb5a27fc41a7 (patch)
tree68e85638e5f5de0d30d1c9881e7f0b5826fe2bca /config.c
parentf2c96ceb57afd8c64c3e3e656f9390c95e9fbec9 (diff)
parent867ad08a2610526edb5723804723d371136fc643 (diff)
downloadgit-6675f501f6b987dbdb0dbeb1d2efeb5a27fc41a7.tar.gz
Merge branch 'ab/hooks'
A new configuration variable core.hooksPath allows customizing where the hook directory is. * ab/hooks: hooks: allow customizing where the hook directory is githooks.txt: minor improvements to the grammar & phrasing githooks.txt: amend dangerous advice about 'update' hook ACL githooks.txt: improve the intro section
Diffstat (limited to 'config.c')
-rw-r--r--config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.c b/config.c
index 262d8d7489..13fb508777 100644
--- a/config.c
+++ b/config.c
@@ -717,6 +717,9 @@ static int git_default_core_config(const char *var, const char *value)
if (!strcmp(var, "core.attributesfile"))
return git_config_pathname(&git_attributes_file, var, value);
+ if (!strcmp(var, "core.hookspath"))
+ return git_config_pathname(&git_hooks_path, var, value);
+
if (!strcmp(var, "core.bare")) {
is_bare_repository_cfg = git_config_bool(var, value);
return 0;