fix: check all git branches for feature numbering to prevent duplicates #1023
+11
−13
Conversation
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
Fixes github#975 The create-new-feature.ps1 script now checks all existing git branches (not just branches with the same short name) when determining the next feature number. This prevents duplicate feature numbers when multiple feature branches exist that haven't been merged to main. Changes: - Updated Get-NextBranchNumber to check ALL branches matching ^\d{3}- - Removed ShortName parameter from function (no longer needed) - Now checks remote, local branches, and specs/ directory for all features - Uses highest number found from any source + 1
Fixes github#975 The create-new-feature.ps1 script now checks ALL existing git branches (not just branches with the same short name) when determining the next feature number. This prevents duplicate feature numbers when multiple feature branches exist that haven't been merged to main. Changes: - Removed ShortName parameter from Get-NextBranchNumber function - Updated regex patterns to match ALL branches with ^\d{3}- pattern - Remote branches: changed from refs/heads/(\d+)-$ShortName$ to refs/heads/(\d{3})- - Local branches: changed from ^\*?\s*(\d+)-$ShortName$ to ^\*?\s*(\d{3})- - Specs directory: changed from ^(\d+)-$ShortName$ to ^(\d{3})- - Updated function call on line 211 to remove -ShortName parameter - Now correctly finds highest feature number across ALL features
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a bug where the Get-NextBranchNumber function was only checking branches with the same short name when determining the next feature number, which caused duplicate feature numbers when multiple feature branches existed that hadn't been merged to main.
Key Changes:
- Removed the
$ShortNameparameter fromGet-NextBranchNumberto check all feature branches instead of filtering by name - Updated all regex patterns to match any branch starting with a 3-digit number followed by a hyphen (
^\d{3}-) - Updated the function call to remove the
-ShortNameparameter
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| # Calculate how much we need to trim from suffix | ||
| # Account for: feature number (3) + hyphen (1) = 4 chars | ||
| $maxSuffixLength = $maxBranchLength - 4 | ||
| $maxSuffixLength = $maxBranchLength - 4; |
There was a problem hiding this comment.
Semicolons are unnecessary in PowerShell and inconsistent with the rest of the file's style. Remove the semicolon at the end of this line.
Suggested change
| $maxSuffixLength = $maxBranchLength - 4; | |
| $maxSuffixLength = $maxBranchLength - 4 |
Comment on lines
242
to
243
| $originalBranchName = $branchName; | ||
| $branchName = "$featureNum-$truncatedSuffix"; |
There was a problem hiding this comment.
Semicolons are unnecessary in PowerShell and inconsistent with the rest of the file's style. Remove the semicolons at the end of these lines.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 #975
Problem
The
Get-NextBranchNumberfunction was checking only branches with the same short name when determining the next feature number, causing duplicate feature numbers when multiple feature branches exist that haven't been merged to main.Solution
Updated the function to check ALL existing git branches matching the pattern
^\d{3}-instead of only branches with the same short name.Changes
$ShortNameparameter fromGet-NextBranchNumberfunctionrefs/heads/(\d{3})-^\*?\s*(\d{3})-^(\d{3})--ShortNameparameter