mirror of
https://github.com/github/spec-kit.git
synced 2026-07-03 12:28:06 +08:00
4687c33b0f
* feat(scripts): optional single-segment branch prefix for gitflow - Add spec_kit_effective_branch_name / Get-SpecKitEffectiveBranchName: when branch matches prefix/rest with exactly one slash, validate and resolve specs/ using only the rest (e.g. feat/001-my-feature). - Wire into check_feature_branch, find_feature_dir_by_prefix (bash) and Test-FeatureBranch, Find-FeatureDirByPrefix + Get-FeaturePathsEnv (PS). - Align git extension git-common with core validation; remove unused get_feature_dir / Get-FeatureDir helpers. - Extend tests in test_timestamp_branches.py and test_git_extension.py. Made-with: Cursor * Update scripts/powershell/common.ps1 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix(ps): align feature-dir resolution errors with bash (no throw under Stop) Find-FeatureDirByPrefix: on ambiguous prefix matches, write errors to stderr and return $null instead of throwing, matching find_feature_dir_by_prefix. Get-FeaturePathsEnv: narrow try/catch to ConvertFrom-Json only; add Get-FeatureDirFromBranchPrefixOrExit to mirror bash get_feature_paths (stderr + exit 1) when prefix lookup fails, avoiding unhandled terminating errors under $ErrorActionPreference = 'Stop' in check-prerequisites, setup-plan, and update-agent-context. Made-with: Cursor * Update tests/test_timestamp_branches.py Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update extensions/git/scripts/powershell/git-common.ps1 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update scripts/powershell/common.ps1 Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
55 lines
2.2 KiB
Bash
Executable File
55 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Git-specific common functions for the git extension.
|
|
# Extracted from scripts/bash/common.sh — contains only git-specific
|
|
# branch validation and detection logic.
|
|
|
|
# Check if we have git available at the repo root
|
|
has_git() {
|
|
local repo_root="${1:-$(pwd)}"
|
|
{ [ -d "$repo_root/.git" ] || [ -f "$repo_root/.git" ]; } && \
|
|
command -v git >/dev/null 2>&1 && \
|
|
git -C "$repo_root" rev-parse --is-inside-work-tree >/dev/null 2>&1
|
|
}
|
|
|
|
# Strip a single optional path segment (e.g. gitflow "feat/004-name" -> "004-name").
|
|
# Only when the full name is exactly two slash-free segments; otherwise returns the raw name.
|
|
spec_kit_effective_branch_name() {
|
|
local raw="$1"
|
|
if [[ "$raw" =~ ^([^/]+)/([^/]+)$ ]]; then
|
|
printf '%s\n' "${BASH_REMATCH[2]}"
|
|
else
|
|
printf '%s\n' "$raw"
|
|
fi
|
|
}
|
|
|
|
# Validate that a branch name matches the expected feature branch pattern.
|
|
# Accepts sequential (###-* with >=3 digits) or timestamp (YYYYMMDD-HHMMSS-*) formats.
|
|
# Logic aligned with scripts/bash/common.sh check_feature_branch after effective-name normalization.
|
|
check_feature_branch() {
|
|
local raw="$1"
|
|
local has_git_repo="$2"
|
|
|
|
# For non-git repos, we can't enforce branch naming but still provide output
|
|
if [[ "$has_git_repo" != "true" ]]; then
|
|
echo "[specify] Warning: Git repository not detected; skipped branch validation" >&2
|
|
return 0
|
|
fi
|
|
|
|
local branch
|
|
branch=$(spec_kit_effective_branch_name "$raw")
|
|
|
|
# Accept sequential prefix (3+ digits) but exclude malformed timestamps
|
|
# Malformed: 7-or-8 digit date + 6-digit time with no trailing slug (e.g. "2026031-143022" or "20260319-143022")
|
|
local is_sequential=false
|
|
if [[ "$branch" =~ ^[0-9]{3,}- ]] && [[ ! "$branch" =~ ^[0-9]{7}-[0-9]{6}- ]] && [[ ! "$branch" =~ ^[0-9]{7,8}-[0-9]{6}$ ]]; then
|
|
is_sequential=true
|
|
fi
|
|
if [[ "$is_sequential" != "true" ]] && [[ ! "$branch" =~ ^[0-9]{8}-[0-9]{6}- ]]; then
|
|
echo "ERROR: Not on a feature branch. Current branch: $raw" >&2
|
|
echo "Feature branches should be named like: 001-feature-name, 1234-feature-name, or 20260319-143022-feature-name" >&2
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|