From: Benjamin C Meyer <ben@meyerhome.net>
Date: Fri, 19 Mar 2010 06:38:40 +0000 (-0400)
Subject: Rather than using an environment variable just use the configuration
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d27278abb8fb1e79182c2cc2be7f9612b0a2812c;p=git-hooks.git

Rather than using an environment variable just use the configuration
option hooks.global.

Signed-off-by: Benjamin C Meyer <ben@meyerhome.net>
---

diff --git a/README b/README
index 2adefcf..ab6ea76 100644
--- a/README
+++ b/README
@@ -19,9 +19,8 @@ or very specific to one person such as:
 git-hooks provide a way to manage and share your hooks by allowing for the installation of hooks in three locations:
  - User hooks that are installed in ~/.git_hooks/
  - Project hooks that are installed in the git_hooks directory inside of each project.
- - Global hooks that are specified with the environment variable GLOBAL_GIT_HOOKS.
- 
-When GLOBAL_GIT_HOOKS is not set it defaults to the git-hooks /contrib/ folder.
+ - Global hooks that are specified with the hooks.global configuration option.
+
 Multiple global hooks directories can be specified by using a space between each path.
 
 For more details on Git Hooks checkout the online documentation at http://www.kernel.org/pub/software/scm/git/docs/githooks.html
diff --git a/git-hooks b/git-hooks
index 1448348..d7ddc7c 100755
--- a/git-hooks
+++ b/git-hooks
@@ -36,11 +36,7 @@ function hook_dirs
     hook="${1}"
     echo "${HOME}/.git_hooks/${hook}"
     echo "${PWD}/git_hooks/${hook}"
-    if [ -z ${GLOBAL_GIT_HOOKS} ] ; then
-        echo "${GHD}/contrib/${hook}"
-    else
-        echo "${GLOBAL_GIT_HOOKS}"
-    fi
+    echo "`git config hooks.global`"/${hook}
 }
 
 function list_hooks_in_dir