Skip to content

fix(git-guards): replace 'branch' with 'worktree' in error messages #191

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
JacobPEvans merged 3 commits into from
Mar 29, 2026
Merged

fix(git-guards): replace 'branch' with 'worktree' in error messages #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48e35ea
fix(git-guards): replace 'branch' with 'worktree' in error messages
JacobPEvans Mar 29, 2026
af5c09d
fix(git-guards): include file path in fallback error message
JacobPEvans Mar 29, 2026
e9910fa
chore: trigger CodeQL scan
JacobPEvans Mar 29, 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
6 changes: 3 additions & 3 deletions git-guards/scripts/main-branch-guard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ def main() -> None:
if worktree_root and Path(worktree_root).name == "main":
deny(
f"BLOCKED: File '{file_path}' is in the main worktree. "
"Editing files on the main branch is not allowed.\n\n"
"Editing files in the main worktree is not allowed.\n\n"
"Create a worktree using `/superpowers:using-git-worktrees`.",
)

current_branch = get_current_branch(file_path)
if current_branch == "main":
deny(
f"BLOCKED: Current branch is 'main'. "
"Editing files on the main branch is not allowed.\n\n"
f"BLOCKED: File '{file_path}' is in the main worktree. "
"Editing files in the main worktree is not allowed.\n\n"
"Create a worktree using `/superpowers:using-git-worktrees`.",
)

Expand Down
4 changes: 2 additions & 2 deletions git-guards/scripts/main-branch-guard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [[ -n "$worktree_root" ]] && [[ "$(basename "$worktree_root")" == "main" ]];
hookSpecificOutput: {
hookEventName: "PreToolUse",
permissionDecision: "deny",
permissionDecisionReason: ("BLOCKED: File '\''\($path)'\'' is in the main worktree. Editing files on the main branch is not allowed.\n\nCreate a worktree using `/superpowers:using-git-worktrees`.")
permissionDecisionReason: ("BLOCKED: File '\''\($path)'\'' is in the main worktree. Editing files in the main worktree is not allowed.\n\nCreate a worktree using `/superpowers:using-git-worktrees`.")
}
}' >&2
exit 2
Expand All @@ -48,7 +48,7 @@ if [[ "$current_branch" == "main" ]]; then
hookSpecificOutput: {
hookEventName: "PreToolUse",
permissionDecision: "deny",
permissionDecisionReason: ("BLOCKED: Current branch is '\''main'\''. Editing files on the main branch is not allowed.\n\nCreate a worktree using `/superpowers:using-git-worktrees`.")
permissionDecisionReason: ("BLOCKED: File '\''\($path)'\'' is in the main worktree. Editing files in the main worktree is not allowed.\n\nCreate a worktree using `/superpowers:using-git-worktrees`.")
}
}' >&2
exit 2
Expand Down
Loading