test: scrub short-flag vocabulary collision #1009

Merged

pullings merged 1 commit from i/897-scrub-commit-qm into main 2026-08-27 17:14:23 +02:00

Conversation 2 Commits 1 Files changed 3 +5 -2

carpenter commented 2026-08-27 16:42:48 +02:00

Owner

Copy link

Refs frankenbit/release-toolkit#897.

Measured on current main 798a5b19cff3319d61e87139c50b00e09166fd03 before editing: exactly two git commit -qm occurrences in two Go test helpers:

• internal/prep/push_failure_test.go:33
• internal/prep/worktreestate_test.go:36

Both are test-only Git argument vectors. The scrub-first disposition is sufficient, so the matcher, built-in vocabulary, and allow-list are unchanged. The existing real-name positive and inverse controls remain in internal/register tests: the QM said matches, while the word-boundary inverse equomatic remains clean.

The two helpers now pass -q and -m as separate Git options. Post-edit measurement finds zero -qm matches.

Verification:

• compact-form control: rt register-check --stdin -> rc 1, git commit -qm base is reported
• scrubbed-form control: same command -> rc 0, git commit -q -m base is clean
• real-name positive: the QM said -> rc 1
• inverse substring: equomatic -> rc 0
• default rt register-check: 0 register-drift hits
• go test ./..., go vet ./..., go build ./...: pass
• bats tests: 118/118 pass
• rt fragment-check changelog.d: pass (existing unrelated warning retained)

Refs frankenbit/release-toolkit#897. Measured on current main `798a5b19cff3319d61e87139c50b00e09166fd03` before editing: exactly two `git commit -qm` occurrences in two Go test helpers: - `internal/prep/push_failure_test.go:33` - `internal/prep/worktreestate_test.go:36` Both are test-only Git argument vectors. The scrub-first disposition is sufficient, so the matcher, built-in vocabulary, and allow-list are unchanged. The existing real-name positive and inverse controls remain in `internal/register` tests: `the QM said` matches, while the word-boundary inverse `equomatic` remains clean. The two helpers now pass `-q` and `-m` as separate Git options. Post-edit measurement finds zero `-qm` matches. Verification: - compact-form control: `rt register-check --stdin` -> rc 1, `git commit -qm base` is reported - scrubbed-form control: same command -> rc 0, `git commit -q -m base` is clean - real-name positive: `the QM said` -> rc 1 - inverse substring: `equomatic` -> rc 0 - default `rt register-check`: 0 register-drift hits - `go test ./...`, `go vet ./...`, `go build ./...`: pass - `bats tests`: 118/118 pass - `rt fragment-check changelog.d`: pass (existing unrelated warning retained)

carpenter added 1 commit 2026-08-27 16:42:48 +02:00

test: avoid register vocabulary collision in git helpers 406c49a6b4

pullings requested review from sentry 2026-08-27 16:46:48 +02:00

sentry approved these changes 2026-08-27 17:09:21 +02:00

sentry left a comment

Copy link

Reviewed exact head 406c49a6b4 against base 798a5b19cf.

APPROVED. This is a correctly scoped fixture-only scrub: both former git commit -qm argument vectors now pass equivalent -q and -m arguments separately, preserving the Git behavior while removing the false register-check match. The matcher, built-in vocabulary, and allow-list are unchanged.

Reproduced at this head: compact git commit -qm base -> exit 1; separated git commit -q -m base -> exit 0; the QM said -> exit 1; equomatic -> exit 0. The exact tree contains no -qm occurrences. Focused/full Go tests, vet, build, Bats 118/118, and Forgejo CI 25/25 are green.

Reviewed exact head 406c49a6b40760be8b5adb5979f233b99d4b714c against base 798a5b19cff3319d61e87139c50b00e09166fd03. APPROVED. This is a correctly scoped fixture-only scrub: both former `git commit -qm` argument vectors now pass equivalent `-q` and `-m` arguments separately, preserving the Git behavior while removing the false register-check match. The matcher, built-in vocabulary, and allow-list are unchanged. Reproduced at this head: compact `git commit -qm base` -> exit 1; separated `git commit -q -m base` -> exit 0; `the QM said` -> exit 1; `equomatic` -> exit 0. The exact tree contains no `-qm` occurrences. Focused/full Go tests, vet, build, Bats 118/118, and Forgejo CI 25/25 are green.

sentry approved these changes 2026-08-27 17:12:20 +02:00

sentry left a comment

Copy link

Reviewed exact head 406c49a6b4 against base 798a5b19cf.

APPROVED. This is a correctly scoped fixture-only scrub: both former git commit -qm argument vectors now pass equivalent -q and -m arguments separately, preserving the Git behavior while removing the false register-check match. The matcher, built-in vocabulary, and allow-list are unchanged.

Reproduced at this head: compact git commit -qm base -> exit 1; separated git commit -q -m base -> exit 0; the QM said -> exit 1; equomatic -> exit 0. The exact tree contains no -qm occurrences. Focused/full Go tests, vet, build, Bats 118/118, and Forgejo CI 25/25 are green.

Reviewed exact head 406c49a6b40760be8b5adb5979f233b99d4b714c against base 798a5b19cff3319d61e87139c50b00e09166fd03. APPROVED. This is a correctly scoped fixture-only scrub: both former `git commit -qm` argument vectors now pass equivalent `-q` and `-m` arguments separately, preserving the Git behavior while removing the false register-check match. The matcher, built-in vocabulary, and allow-list are unchanged. Reproduced at this head: compact `git commit -qm base` -> exit 1; separated `git commit -q -m base` -> exit 0; `the QM said` -> exit 1; `equomatic` -> exit 0. The exact tree contains no `-qm` occurrences. Focused/full Go tests, vet, build, Bats 118/118, and Forgejo CI 25/25 are green.

pullings merged commit 406c49a6b4 into main 2026-08-27 17:14:23 +02:00

pullings deleted branch i/897-scrub-commit-qm 2026-08-27 17:14:23 +02:00

Sign in to join this conversation.

Reviewers

No reviewers

sentry

Labels

Clear labels   

bump

major

Override the cut bump to MAJOR (release-toolkit#107)

  

bump

minor

Override the cut bump to MINOR (release-toolkit#107)

  

bump

patch

Override the cut bump to PATCH (release-toolkit#107)

  

kind/bug

Something is broken

  

kind/chore

Maintenance, tooling, refactor

  

kind/docs

Documentation work

  

kind/feature

New feature or capability

  

priority/critical

Critical: must be addressed immediately

  

priority/high

Important, should be addressed soon

  

priority/low

Low priority, address when convenient

  

priority/medium

Normal priority

  

size/L

Large: significant feature, ~6-16h

  

size/M

Medium: moderate feature, ~2-6h

  

size/S

Small: simple change, ~1-2h

  

size/XL

Extra large: major feature or refactor, 16h+

No labels

bump

major

bump

minor

bump

patch

kind/bug

kind/chore

kind/docs

kind/feature

priority/critical

priority/high

priority/low

priority/medium

size/L

size/M

size/S

size/XL

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

frankenbit/release-toolkit!1009

No description provided.