Skip to content

fix: U7 #9926 leftover discoveries — hook over-block + git-cliff dropped commits (#10126, #10118) - #10433

Merged
mrveiss merged 3 commits into
Dev_new_guifrom
issue-10126-u7disc
Jun 21, 2026
Merged

mrveiss merged 3 commits into
Dev_new_guifrom
issue-10126-u7disc

Conversation

@mrveiss

@mrveiss mrveiss commented Jun 21, 2026

Copy link
Copy Markdown
Owner

Thinking Path

All 9 working members of umbrella #9926 are already closed; it stays open only for the owner/lawyer-gated relicense epic #9826. The genuinely actionable leftovers were the discovery issues filed during #9926. Of the four originally scoped, #10119 and #10059 were fixed by other sessions mid-work (closed via #10402 and #10393 respectively) — so this PR carries only the two that remained open: #10126 and #10118.

What Changed

#10126 — block-dangerous-commands.sh over-blocked legitimate git

The hook blocked safe forms on the main tree (git checkout -b, git checkout -- <file>, git switch -, git switch --detach HEAD). Loosened the branch-guard so it blocks only bare branch-name switches (git checkout <branch> / git switch <branch>), while allowing new-branch creation, file restore, SHA/tag/Dev_new_gui checkouts, and detached/toggle switches. main/master stay blocked by the separate earlier guard.

Also made the test CWD-deterministic (runs each case from a mktemp dir so it always asserts main-tree semantics) — it previously regressed to 23/27 when run from inside .worktrees/ because the hook skips the guard there.

#10118 — git-cliff silently dropped ~752 non-conventional commits

cliff.toml had filter_unconventional = true with no catch-all parser, so non-conventional commits never reached the changelog or the --bumped-version logic. Set filter_unconventional = false, added a trailing catch-all parser ("Other / Uncategorized"), and skip ^Merge bubbles to keep that section clean. This restores changelog visibility only — semver-bump capability for non-conventional commits still needs commit-message enforcement (noted in RELEASE_WORKFLOW.md, tracked separately).

Verification

  • bash .claude/hooks/block-dangerous-commands_test.sh → 27 passed, 0 failed (confirmed from both the main tree and inside a worktree).
  • Beyond-suite checks: git checkout feature-branch, git checkout issue-1234, git switch some-branch still exit 2 (blocked); the 5 safe forms exit 0.
  • git-cliff v2.10.1 run against the new cliff.toml: "Other / Uncategorized" section now renders (+177 net commit lines captured vs. the old config); 0 merge-bubble commits leak into output.
  • code-reviewer agent: APPROVE, no HIGH/MEDIUM findings.

Closes #10126
Closes #10118

Model Used

Opus 4.8 (1M context)

mrveiss and others added 2 commits June 21, 2026 22:59
…WD-deterministic (#10126)

The git branch-block over-blocked legitimate forms on the main tree
(checkout -b, checkout -- <file>, switch -, switch --detach HEAD). Loosen it
to block ONLY bare branch-name switches; allow new-branch creation, file
restore, SHA/tag/Dev_new_gui checkouts and detached/toggle switches.

Make the test suite CWD-deterministic (run each case from a mktemp dir so it
always asserts main-tree semantics) — it now reports 27/27 from any directory,
including inside .worktrees/ where it previously regressed to 23/27.

Closes #10126

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…parser (#10118)

filter_unconventional=true + no catch-all silently dropped ~752 commits from
the changelog. Set filter_unconventional=false and add a trailing catch-all
commit_parser ("Other / Uncategorized") so they surface; skip ^Merge bubbles
to keep that section clean. Restores changelog visibility (not semver-bump
capability, which needs commit-message enforcement). Doc updated.

Closes #10118

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@github-actions

github-actions Bot commented Jun 21, 2026 •

Copy link
Copy Markdown
Contributor

✅ SSOT Configuration Compliance: Passing

🎉 No hardcoded values detected that have SSOT config equivalents!

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant