fix: count worktree branches in git extension numbering (#3054)

* fix: count worktree branches in git extension numbering

* fix: preserve literal plus branch prefixes
This commit is contained in:
LuoHui1
2026-06-18 22:40:32 +08:00
committed by GitHub
parent afff4eba15
commit 4eda983950
3 changed files with 62 additions and 2 deletions

View File

@@ -127,7 +127,7 @@ get_highest_from_specs() {
# Function to get highest number from git branches
get_highest_from_branches() {
git branch -a 2>/dev/null | sed 's/^[* ]*//; s|^remotes/[^/]*/||' | _extract_highest_number
git branch -a 2>/dev/null | sed -E 's/^[+*][[:space:]]+//; s/^[[:space:]]+//; s|^remotes/[^/]*/||' | _extract_highest_number
}
# Extract the highest sequential feature number from a list of ref names (one per line).

View File

@@ -88,7 +88,7 @@ function Get-HighestNumberFromBranches {
$branches = git branch -a 2>$null
if ($LASTEXITCODE -eq 0 -and $branches) {
$cleanNames = $branches | ForEach-Object {
$_.Trim() -replace '^\*?\s+', '' -replace '^remotes/[^/]+/', ''
$_.Trim() -replace '^[+*]?\s+', '' -replace '^remotes/[^/]+/', ''
}
return Get-HighestNumberFromNames -Names $cleanNames
}