From b3945d44c9c0f70054aebb3edc7b488c0544210b Mon Sep 17 00:00:00 2001 From: Sitaram Chamarty Date: Wed, 10 Mar 2010 06:24:53 +0530 Subject: [PATCH] docs and .gitattributes hadn't been updated for the change in hooks dir --- .gitattributes | 7 ++++--- conf/example.conf | 4 ++-- doc/2-admin.mkd | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index 5d894ad..85f7e74 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ -conf/* crlf=input -src/* crlf=input -src/hooks/* crlf=input +conf/* crlf=input +src/* crlf=input +hooks/common/* crlf=input +hooks/gitolite-admin/* crlf=input diff --git a/conf/example.conf b/conf/example.conf index de2ccf1..c197dbc 100644 --- a/conf/example.conf +++ b/conf/example.conf @@ -253,8 +253,8 @@ gitolite "Sitaram Chamarty" = "fast, secure, access control for git in a corpora # syntax: # config sectionname.keyname = [optional value_string] -# example usage: if you placed a hook in src/hooks that requires configuration -# information that is specific to each repo, you could do this: +# example usage: if you placed a hook in hooks/common that requires +# configuration information that is specific to each repo, you could do this: repo gitolite config hooks.mailinglist = gitolite-commits@example.tld diff --git a/doc/2-admin.mkd b/doc/2-admin.mkd index ad9f18e..b5a6c08 100644 --- a/doc/2-admin.mkd +++ b/doc/2-admin.mkd @@ -99,15 +99,15 @@ for the special usernames or remove the description line. #### custom hooks If you want to put in your own, custom, hooks every time a new repo is created -by gitolite, put a **tested** hook script in `src/hooks`. As distributed, the -only file there is the `update` hook, but everything (*everything*) in that -directory will get copied to the `hooks/` subdirectory of every *new* repo -created. +by gitolite, put a **tested** hook script in `hooks/common` of your gitolite +clone before running easy-install. As distributed, there are only two files +there, but everything (*everything*) in that directory will get copied to the +`hooks/` subdirectory of every *new* repo created. In order to push a new or updated hook script to *existing* repos as well, just run easy install once again; it'll do it to existing repos also. -**VERY IMPORTANT SECURITY NOTE: the `update` hook in `src/hooks` is what +**VERY IMPORTANT SECURITY NOTE: the `update` hook in `hooks/common` is what implements all the branch-level permissions in gitolite. If you fiddle with the hooks directory, please make sure you do not mess with this file accidentally, or all your fancy per-branch permissions will stop working.**