diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-11-30 15:24:38 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-01 11:00:13 -0800 |
| commit | b849b954d22ee069b0edec1a12c78782ae1e629d (patch) | |
| tree | c5f3d71a51a6c0f356f496228b0c72358c5269a2 /templates | |
| parent | 3bc518084acfdbc81a656c9cdff1f1bd50e0615f (diff) | |
| download | git-b849b954d22ee069b0edec1a12c78782ae1e629d.tar.gz git-b849b954d22ee069b0edec1a12c78782ae1e629d.tar.xz | |
*.sh: avoid hardcoding $GIT_DIR/hooks/...
If $GIT_COMMON_DIR is set, it should be $GIT_COMMON_DIR/hooks/, not
$GIT_DIR/hooks/. Just let rev-parse --git-path handle it.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'templates')
| -rwxr-xr-x | templates/hooks--applypatch-msg.sample | 4 | ||||
| -rwxr-xr-x | templates/hooks--pre-applypatch.sample | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/hooks--applypatch-msg.sample b/templates/hooks--applypatch-msg.sample index 8b2a2fe84..a5d7b84a6 100755 --- a/templates/hooks--applypatch-msg.sample +++ b/templates/hooks--applypatch-msg.sample @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -test -x "$GIT_DIR/hooks/commit-msg" && - exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} : diff --git a/templates/hooks--pre-applypatch.sample b/templates/hooks--pre-applypatch.sample index b1f187c2e..4142082bc 100755 --- a/templates/hooks--pre-applypatch.sample +++ b/templates/hooks--pre-applypatch.sample @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} : |