Revert "checkout: retire --ignore-other-worktrees in favor of --force"

diff --git a/git-rebase.sh b/git-rebase.sh
index 55da9db818665f39ed205d3c77352987e3ca9963..fb935a03f3ababaa6359d6a7a4deafcbaa9f15c2 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -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
 }