*.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>
This commit is contained in:

committed by
Junio C Hamano

parent
3bc518084a
commit
b849b954d2
@ -642,9 +642,9 @@ do_next () {
|
||||
git notes copy --for-rewrite=rebase < "$rewritten_list" ||
|
||||
true # we don't care if this copying failed
|
||||
} &&
|
||||
if test -x "$GIT_DIR"/hooks/post-rewrite &&
|
||||
test -s "$rewritten_list"; then
|
||||
"$GIT_DIR"/hooks/post-rewrite rebase < "$rewritten_list"
|
||||
hook="$(git rev-parse --git-path hooks/post-rewrite)"
|
||||
if test -x "$hook" && test -s "$rewritten_list"; then
|
||||
"$hook" rebase < "$rewritten_list"
|
||||
true # we don't care if this hook failed
|
||||
fi &&
|
||||
warn "Successfully rebased and updated $head_name."
|
||||
|
Reference in New Issue
Block a user