Skip to content

fix(hooks): guard-git.sh sed patterns work on macOS BSD sed #1146

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

Merged
carlos-alm merged 4 commits into from
May 18, 2026
Merged

fix(hooks): guard-git.sh sed patterns work on macOS BSD sed #1146

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff3b6b9
fix(hooks): guard-git.sh sed patterns work on macOS BSD sed
carlos-alm May 17, 2026
dc49d47
Merge branch 'main' into fix/1145-guard-git-bsd-sed
carlos-alm May 18, 2026
5df2d36
Merge branch 'main' into fix/1145-guard-git-bsd-sed
carlos-alm May 18, 2026
48dd55f
Merge branch 'main' into fix/1145-guard-git-bsd-sed
carlos-alm May 18, 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
17 changes: 11 additions & 6 deletions .claude/hooks/guard-git.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ fi
# the opening `"` of a quoted path (which would leave a trailing `path"` in
# NCOMMAND). The pattern re-anchors on `git`, so multi-`-C` chains (e.g.
# `git -C /a -C /b push`) need a second pass to collapse the residual `-C`.
NCOMMAND=$(echo "$COMMAND" | sed -E 's/(^|\s|&&\s*)git[[:space:]]+-C[[:space:]]+"[^"]+"/\1git/g; s/(^|\s|&&\s*)git[[:space:]]+-C[[:space:]]+[^"[:space:]][^[:space:]]*/\1git/g')
NCOMMAND=$(echo "$NCOMMAND" | sed -E 's/(^|\s|&&\s*)git[[:space:]]+-C[[:space:]]+"[^"]+"/\1git/g; s/(^|\s|&&\s*)git[[:space:]]+-C[[:space:]]+[^"[:space:]][^[:space:]]*/\1git/g')
NCOMMAND=$(echo "$COMMAND" | sed -E 's/(^|[[:space:]]|&&[[:space:]]*)git[[:space:]]+-C[[:space:]]+"[^"]+"/\1git/g; s/(^|[[:space:]]|&&[[:space:]]*)git[[:space:]]+-C[[:space:]]+[^"[:space:]][^[:space:]]*/\1git/g')
NCOMMAND=$(echo "$NCOMMAND" | sed -E 's/(^|[[:space:]]|&&[[:space:]]*)git[[:space:]]+-C[[:space:]]+"[^"]+"/\1git/g; s/(^|[[:space:]]|&&[[:space:]]*)git[[:space:]]+-C[[:space:]]+[^"[:space:]][^[:space:]]*/\1git/g')

deny() {
local reason="$1"
Expand Down Expand Up @@ -117,11 +117,16 @@ detect_work_dir() {
# `git -C` is the explicit git-level override and wins over any ambient cd prefix,
# so check it first (e.g. `cd /tmp && git -C /worktree push` targets /worktree).
# Greedy `.*-C` anchors on the LAST `-C` in the chosen segment.
if echo "$search_str" | grep -qE 'git\s+([^&|;]*\s)?-C\s+'; then
work_dir=$(echo "$search_str" | sed -nE 's/.*-C[[:space:]]+"([^"]+)".*/\1/p;t;s/.*-C[[:space:]]+([^[:space:]]+).*/\1/p')
# Two separate sed invocations (quoted path first, then unquoted fallback) instead
# of a single `;t;s` chain — BSD sed parses chained s/// after `t` as a label.
if echo "$search_str" | grep -qE 'git[[:space:]]+([^&|;]*[[:space:]])?-C[[:space:]]+'; then
work_dir=$(echo "$search_str" | sed -nE 's/.*-C[[:space:]]+"([^"]+)".*/\1/p')
if [ -z "$work_dir" ]; then
work_dir=$(echo "$search_str" | sed -nE 's/.*-C[[:space:]]+([^[:space:]]+).*/\1/p')
fi
fi
if [ -z "$work_dir" ] && echo "$COMMAND" | grep -qE '^\s*cd\s+'; then
work_dir=$(echo "$COMMAND" | sed -nE 's/^\s*cd\s+"?([^"&]+)"?\s*&&.*/\1/p')
if [ -z "$work_dir" ] && echo "$COMMAND" | grep -qE '^[[:space:]]*cd[[:space:]]+'; then
work_dir=$(echo "$COMMAND" | sed -nE 's/^[[:space:]]*cd[[:space:]]+"?([^"&]+)"?[[:space:]]*&&.*/\1/p')
fi
# Trim trailing whitespace
work_dir="${work_dir%"${work_dir##*[![:space:]]}"}"
Expand Down
Loading