💫 Toolkit to help you get started with SDD or any other process!
fix: use global maximum for branch numbering to prevent collisions
Joseph Mearman33df8976ca71
diff --git a/scripts/bash/create-new-feature.sh b/scripts/bash/create-new-feature.shindex 592dab2ea..9e57cc6ec 100644--- a/scripts/bash/create-new-feature.sh+++ b/scripts/bash/create-new-feature.sh@@ -130,30 +130,22 @@ get_highest_from_branches() {check_existing_branches() {local short_name="$1"local specs_dir="$2"-+# Fetch all remotes to get latest branch info (suppress errors if no remotes)git fetch --all --prune 2>/dev/null || true-- # Find all branches matching the pattern using git ls-remote (more reliable)- local remote_branches=$(git ls-remote --heads origin 2>/dev/null | grep -E "refs/heads/[0-9]+-${short_name}$" | sed 's/.*\/\([0-9]*\)-.*/\1/' | sort -n)-- # Also check local branches- local local_branches=$(git branch 2>/dev/null | grep -E "^[* ]*[0-9]+-${short_name}$" | sed 's/^[* ]*//' | sed 's/-.*//' | sort -n)-- # Check specs directory as well- local spec_dirs=""- if [ -d "$specs_dir" ]; then- spec_dirs=$(find "$specs_dir" -maxdepth 1 -type d -name "[0-9]*-${short_name}" 2>/dev/null | xargs -n1 basename 2>/dev/null | sed 's/-.*//' | sort -n)++ # Get highest number from ALL branches (not just matching short name)+ local highest_branch=$(get_highest_from_branches)++ # Get highest number from ALL specs (not just matching short name)+ local highest_spec=$(get_highest_from_specs "$specs_dir")++ # Take the maximum of both+ local max_num=$highest_branch+ if [ "$highest_spec" -gt "$max_num" ]; then+ max_num=$highest_specfi-- # Combine all sources and get the highest number- local max_num=0- for num in $remote_branches $local_branches $spec_dirs; do- if [ "$num" -gt "$max_num" ]; then- max_num=$num- fi- done-+# Return next numberecho $((max_num + 1))}diff --git a/scripts/powershell/create-new-feature.ps1 b/scripts/powershell/create-new-feature.ps1index 351f4e9e7..80e989c37 100644--- a/scripts/powershell/create-new-feature.ps1+++ b/scripts/powershell/create-new-feature.ps1@@ -104,66 +104,23 @@ function Get-NextBranchNumber {[string]$ShortName,[string]$SpecsDir)-+# Fetch all remotes to get latest branch info (suppress errors if no remotes)try {git fetch --all --prune 2>$null | Out-Null} catch {# Ignore fetch errors}-- # Find remote branches matching the pattern using git ls-remote- $remoteBranches = @()- try {- $remoteRefs = git ls-remote --heads origin 2>$null- if ($remoteRefs) {- $remoteBranches = $remoteRefs | Where-Object { $_ -match "refs/heads/(\d+)-$([regex]::Escape($ShortName))$" } | ForEach-Object {- if ($_ -match "refs/heads/(\d+)-") {- [int]$matches[1]- }- }- }- } catch {- # Ignore errors- }-- # Check local branches- $localBranches = @()- try {- $allBranches = git branch 2>$null- if ($allBranches) {- $localBranches = $allBranches | Where-Object { $_ -match "^\*?\s*(\d+)-$([regex]::Escape($ShortName))$" } | ForEach-Object {- if ($_ -match "(\d+)-") {- [int]$matches[1]- }- }- }- } catch {- # Ignore errors- }-- # Check specs directory- $specDirs = @()- if (Test-Path $SpecsDir) {- try {- $specDirs = Get-ChildItem -Path $SpecsDir -Directory | Where-Object { $_.Name -match "^(\d+)-$([regex]::Escape($ShortName))$" } | ForEach-Object {- if ($_.Name -match "^(\d+)-") {- [int]$matches[1]- }- }- } catch {- # Ignore errors- }- }-- # Combine all sources and get the highest number- $maxNum = 0- foreach ($num in ($remoteBranches + $localBranches + $specDirs)) {- if ($num -gt $maxNum) {- $maxNum = $num- }- }-++ # Get highest number from ALL branches (not just matching short name)+ $highestBranch = Get-HighestNumberFromBranches++ # Get highest number from ALL specs (not just matching short name)+ $highestSpec = Get-HighestNumberFromSpecs -SpecsDir $SpecsDir++ # Take the maximum of both+ $maxNum = [Math]::Max($highestBranch, $highestSpec)+# Return next numberreturn $maxNum + 1}