mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*.sh: avoid hardcoding $GIT_DIR/hooks/...

Browse Source 
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>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2014-11-30 15:24:38 +07:00
committed by Junio C Hamano
parent 3bc518084a
commit b849b954d2
6 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-rebase.sh
View File

@ -202,9 +202,9 @@ run_specific_rebase () {
run_pre_rebase_hook () {
if test -z "$ok_to_skip_pre_rebase" &&
test -x "$GIT_DIR/hooks/pre-rebase"
test -x "$(git rev-parse --git-path hooks/pre-rebase)"
then
"$GIT_DIR/hooks/pre-rebase" ${1+"$@"} ||
"$(git rev-parse --git-path hooks/pre-rebase)" ${1+"$@"} ||
die "$(gettext "The pre-rebase hook refused to rebase.")"
fi
}