feat(scripts): add --allow-existing-branch flag to create-new-feature#1999
Merged
mnriem merged 2 commits intogithub:mainfrom Mar 27, 2026
Merged
feat(scripts): add --allow-existing-branch flag to create-new-feature#1999mnriem merged 2 commits intogithub:mainfrom
mnriem merged 2 commits intogithub:mainfrom
Conversation
Add an --allow-existing-branch / -AllowExistingBranch flag to both bash and PowerShell create-new-feature scripts. When the target branch already exists, the script switches to it instead of failing. The spec directory and template are still created if missing, but existing spec.md files are not overwritten (prevents data loss on re-runs). The flag is opt-in, so existing behavior is completely unchanged without it. This enables worktree-based workflows and CI/CD pipelines that create branches externally before running speckit.specify. Relates to github#1931. Also addresses github#1680, github#841, github#1921. Assisted-By: 🤖 Claude Code
Contributor
There was a problem hiding this comment.
Pull request overview
Adds an opt-in --allow-existing-branch / -AllowExistingBranch mode to the create-new-feature scripts so workflows that pre-create branches (e.g., CI/worktrees) can reuse them without failing, while also preventing accidental overwrites of existing spec.md.
Changes:
- Add
--allow-existing-branch(bash) and-AllowExistingBranch(PowerShell) to switch to an existing target branch instead of erroring. - Avoid overwriting an existing
spec.mdby only copying/creating it when missing. - Add pytest coverage for the bash allow-existing-branch behavior (8 test cases).
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.
| File | Description |
|---|---|
scripts/bash/create-new-feature.sh |
Adds --allow-existing-branch handling and avoids overwriting spec.md. |
scripts/powershell/create-new-feature.ps1 |
Mirrors allow-existing-branch behavior and avoids overwriting spec.md. |
tests/test_timestamp_branches.py |
Adds tests validating allow-existing-branch behavior (bash) and spec overwrite protection. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
- Make checkout failure fatal instead of suppressing with || true (bash) - Check $LASTEXITCODE after git checkout in PowerShell - Use Test-Path -PathType Leaf for spec file existence check (PS) - Add PowerShell static assertion test for -AllowExistingBranch flag Assisted-By: 🤖 Claude Code
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
mnriem
requested changes
Mar 27, 2026
Collaborator
mnriem
left a comment
mnriem
left a comment
There was a problem hiding this comment.
Please address Copilot feedback. If not applicable, please explain why
mnriem
approved these changes
Mar 27, 2026
Collaborator
|
Thank you! |
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.
Summary
--allow-existing-branch/-AllowExistingBranchflag to both bash and PowerShellcreate-new-featurescriptsspec.mdfiles are NOT overwritten (prevents data loss on re-runs)This enables worktree-based workflows and CI/CD pipelines that create branches externally before running
speckit.specify.Relates to #1931. Also addresses #1680, #841, and #1921.
Companion to #1998 (
--dry-runflag, independent).Changes
scripts/bash/create-new-feature.sh--allow-existing-branchflag, modify branch creation to switch on existing, protect spec.md from overwritescripts/powershell/create-new-feature.ps1-AllowExistingBranchswitch, mirror bash logictests/test_timestamp_branches.pyTestAllowExistingBranchclass with 8 test casesTest plan
--allow-existing-branch, verify switch + spec dir creationBackwards compatibility
--allow-existing-branch, behavior is identical to before (error on existing branch)🤖 Generated with Claude Code