Skip to content

chore: de-squad branch-naming convention (#476)#480

Merged
primetimetank21 merged 2 commits into
developfrom
chore/476-desquad-branch-naming
Jun 13, 2026
Merged

chore: de-squad branch-naming convention (#476)#480
primetimetank21 merged 2 commits into
developfrom
chore/476-desquad-branch-naming

Conversation

@primetimetank21

@primetimetank21 primetimetank21 commented Jun 13, 2026

Copy link
Copy Markdown
Owner

Closes #476

Summary

Drops the branch-ancestry check entirely (Option B, decided by Earl 2026-06-12 -- supersedes the earlier "generalize" plan). The hygiene test stubs were already half-removed; Option B completes the migration cleanly.

Files changed (3)

  • hooks/pre-commit -- removed the squad/* ancestry guard (old Check 1 + its case block); renumbered the remaining checks so they read 1 = ASCII-only, 2 = refuse direct commits to develop/main/master, 3 = shellcheck; updated the branch suggestion in the help text to feat/<issue>-<slug>.
  • tests/test_precommit_hygiene.sh -- removed the three no-op ancestry pass stubs (T1a/T1b/T1c) and the dead "Check 1" section they lived in; renumbered the test sections + IDs to match the hook's real 3-check order; renamed the cast-name sample branch pluto/249-fix -> feat/249-fix (T3e -> T2e); fixed the header comment.
  • tests/test_windows_setup.ps1 -- renamed cast-name sample branches used as test data: pluto/ascii-fail -> feat/ascii-fail (Y-1), pluto/ascii-pass -> feat/ascii-pass (Y-2), squad/224-test -> feat/224-test (Y-5), squad/224-advisory-test -> feat/224-advisory-test (Y-6). These are sample data only -- they exercise the pre-push guard (test: add behavioral coverage for pre-commit + pre-push hooks #224), not branch naming.

What is retained

The "refuse direct commits to develop/main/master" check (now Check 2) is retained unchanged -- it is a general protected-branch guard, not squad-specific.

Local verification

  • shellcheck: PASS
  • sh -n (POSIX syntax): PASS
  • test_precommit_hygiene.sh: 15/15 PASS (down from 18 after removing the 3 no-op ancestry stubs -- every remaining test asserts real behavior)
  • ASCII check on test_windows_setup.ps1: PASS
  • CI: 10/10 green

Follow-up (out of scope for #476)

Residual squad/cast-name references found in a post-cleanup validation sweep (the .copilot/skills/ product tree, the gosquad alias, CONTRIBUTING SQUAD_WORKTREES, setup.sh comment, and the test_windows_setup.ps1:878 "squad BEGIN/END markers" profile-marker test) are tracked separately in #481.

Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com

Closes #476

Dropped the branch-ancestry check entirely (Option B per Earl's decision
2026-06-12) -- the test stubs already assumed it was gone. Renamed all
cast-name sample branches (pluto/*, squad/*) to feat/* equivalents in
test_precommit_hygiene.sh and test_windows_setup.ps1. Check 3
(refuse direct commits to develop/main/master) is retained unchanged.
Renumbered hook checks 2/3/4 -> 1/2/3 and updated branch-suggestion
in the help message to feat/<issue>-<slug>.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@primetimetank21 primetimetank21 marked this pull request as ready for review June 13, 2026 03:39
Deletes the 3 vestigial T1a/T1b/T1c no-op passes left behind when the
branch-ancestry check was removed in #476. Those stubs asserted nothing
and always passed, inflating the test count by 3.

Renumbers section headers and test-ID prefixes to match the hook's real
3-check structure: Check 1=ASCII-only, Check 2=protected-branch,
Check 3=shellcheck. Updates the file's top header comment block to drop
the ancestry line and the stale 4-check count. Test tally: 18 -> 15.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@primetimetank21 primetimetank21 merged commit 72a6027 into develop Jun 13, 2026
10 checks passed
@primetimetank21 primetimetank21 deleted the chore/476-desquad-branch-naming branch June 13, 2026 04:14
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.

De-squad the squad/* branch-naming convention (hook + tests)

1 participant