Skip to content

fix(hooks): resolve pre-push workspace root from the main clone, not the worktree #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ProtocolWarden wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(hooks): resolve pre-push workspace root from the main clone, not the worktree #490

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fa8e00
fix(hooks): resolve workspace root from the main clone, not the worktree
ProtocolWarden Aug 3, 2026
f79c480
Merge origin/main into claude/fix-pre-push-worktree-discovery
ProtocolWarden Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .hooks/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,18 @@ custodian_multi=""
if command -v custodian-multi >/dev/null 2>&1; then
custodian_multi="$(command -v custodian-multi)"
fi
# A worktree has no venv of its own — the interpreter lives in the main clone, so
# the main_clone_root candidates are the ones that actually resolve there. Without
# them a worktree push on a box whose only custodian-multi is <clone>/.venv/bin
# (no PATH entry, no sibling Custodian checkout — the fleet's layout) dies on
# "custodian-multi not found". For a plain checkout main_clone_root == repo_root,
# so these are harmless duplicates of the two above.
for candidate in \
"$custodian_multi" \
"$repo_root/.venv/bin/custodian-multi" \
"$repo_root/.warehouse-venv/bin/custodian-multi" \
"$main_clone_root/.venv/bin/custodian-multi" \
"$main_clone_root/.warehouse-venv/bin/custodian-multi" \
"$workspace_root/Custodian/.venv/bin/custodian-multi"
do
if [ -x "$candidate" ]; then
Expand Down
Loading