Spell the Rename in the Form That Carries No Version Floor - #617
Merged
Conversation
Raised on the promotion pull request, against the block #614 added. The line used git branch --move --force while the paragraph under it claimed the block needs no minimum version, and the long options are newer than the short one the claim rests on. Checked against git's own source rather than recollection. In v1.5.4 neither long option exists, the table carrying OPT_BIT('m', NULL, ...), OPT_BIT('M', NULL, ...) and OPT_BOOLEAN('f', NULL, ...), so -m, -M and -f are the whole of it. By v2.0.0 the table carries OPT_BIT('m', "move", ...) and OPT__FORCE, so both long forms exist, and -M still has no long equivalent in either. So the finding is right about the direction and the block was claiming more than it could carry. The long forms are far older than git switch at 2.23 and git init --initial-branch at 2.28, which the prose named, but the claim was no floor at all rather than a floor earlier than those. The line is -M now, and the prose says why it is written short, so a later edit does not restore the long form for consistency with the rest of the block. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR adjusts the STANDUP.md branch-bootstrap instructions to use the git branch -M spelling for the initial branch rename, aligning the procedure with the stated goal of avoiding newer long-option spellings that can imply a higher minimum Git version.
Changes:
- Replace
git branch --move --force mainwithgit branch -M mainin the branch bootstrap command block. - Update the explanatory paragraph to explicitly justify the
-Mspelling as an intentional compatibility choice.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
The finding is that the paragraph said every command in the block is spelled in the form carrying no version floor, while the block also runs git config --local, git commit --allow-empty --message and git log --format, none of which that claim was checked against. One command was checked, which is the rename, and the sentence now says only that. It reads as why -M is written short rather than as a property of the whole block, which is what the paragraph was for. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
ptr727
added a commit
that referenced
this pull request
Aug 8, 2026
…-coverage remedy (#615) Promotes `develop` to `main`, carrying five merged pull requests. ## What is being promoted - **[#617](#617 `8515666`, the branch rename written `-M` rather than `--move --force`, which git gained later, checked against git's own option tables at `v1.5.4` and `v2.0.0`. - **[#616](#616 `08cf819`, the partial-coverage status line counting the unread files rather than asserting there is one. - **[#614](#614 `f39e0c0`, the branch bootstrap step in [`STANDUP.md`](./STANDUP.md). Section 0B states the sequence that keeps the exploratory standup off `main` and `develop`, carries the procedure's only `git init` alongside both of section 0's identity checks, and records why the post-hoc cleanup is unavailable. It also carries one Disproved Claims entry and the removal of the shipped backlog cluster. - **[#613](#613 `676a2bd`, the partial-coverage remedy in `scripts/pr_review.py` and its two documentation mirrors, corrected to what the record supports after measuring 4 pull requests and 7 rounds with 0 recoveries. - **[#612](#612 `1892d6f`, a Dependabot group bump of four actions. #616 and #617 both answer findings raised by the review **on this promotion**. A promotion's head is `develop`, so neither could be fixed here, and each took its own pull request into `develop` and its own review rounds before merging. ## Review state Each of the five was reviewed and merged on its own pull request, so this promotion carries no unreviewed change. #614 ran 13 rounds, 12 findings accepted and 1 declined and recorded under Disproved Claims. #616 ran 3 rounds and #617 ran 2, all findings accepted. ## Merge shape This is a promotion, so it merges as a **merge commit** rather than a squash, per [`GOVERNANCE.md`](./GOVERNANCE.md) "Branching Model". Its head is `develop` itself, so it must **not** be merged with `--delete-branch`.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a finding Copilot raised on the promotion pull request #615, against the command block #614 added. A promotion's head is
develop, so the fix lands here rather than there.The finding
What the source says
Checked against git's own option tables rather than taken on faith, since the claim is about when a spelling became available:
git branchoption tablev1.5.4OPT_BIT('m', NULL, ...),OPT_BIT('M', NULL, ...),OPT_BOOLEAN('f', NULL, ...)v2.0.0OPT_BIT('m', "move", ...),OPT_BIT('M', NULL, ...),OPT__FORCE(...)So
--moveand--forcedid not exist in 1.5.4 and did by 2.0.0, and-Mhas no long equivalent in either. The finding has the direction right.It also bounds how wrong the block was. The long forms are far older than
git switchat 2.23 andgit init --initial-branchat 2.28, which is what the prose named, so nothing here was going to break on a plausible host. The claim was no floor at all rather than a floor earlier than those two, and the long forms do carry one.The change
The line reads
git branch -M main, and the paragraph says the short form is deliberate rather than terse, so a later edit does not restore the long form for consistency with the rest of the block.Verification
prose_lint.pyboth invocations plussentence-split,editorconfig-checkerexit 0,markdownlint-cli20 issues across 44 files, andSTANDUP.mdat 206 of 206 CRLF lines. The block's comment column is unchanged at 65.