mirror of
https://github.com/github/spec-kit.git
synced 2026-07-07 14:39:00 +08:00
f494a8e33e
* test: cover namespaced git branch templates
Assisted-by: Codex (model: GPT-5, autonomous)
* feat: support namespaced git branch templates
Assisted-by: Codex (model: GPT-5, autonomous)
* test: cover git branch template edge cases
Assisted-by: Codex (model: GPT-5, autonomous)
* fix: harden git branch template parsing
Assisted-by: Codex (model: GPT-5, autonomous)
* fix: address git branch template review feedback
Address Copilot review feedback for branch_prefix help text, namespaced GIT_BRANCH_NAME fallback behavior, final-segment validation docs, and Bash UTF-8 byte reporting.
Assisted-by: Codex (model: GPT-5, autonomous)
* fix: reject slug-scoped branch templates
Reject branch templates that place {slug} before {number}, because that makes namespace scanning depend on the generated feature slug and can reset numbering per feature name.
Assisted-by: Codex (model: GPT-5, autonomous)
* fix: ignore malformed timestamp refs when numbering
Align branch-number scanning with feature-branch validation so malformed timestamp-looking refs do not inflate sequential numbering. Also updates the stale git-common comment called out in review.
Assisted-by: Codex (model: GPT-5, autonomous)
57 lines
2.3 KiB
Bash
Executable File
57 lines
2.3 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,
|
|
# either at the start of the branch or after path-style namespace prefixes.
|
|
# Logic aligned with the git extension's PowerShell Test-FeatureBranch twin.
|
|
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")
|
|
local feature_segment="${branch##*/}"
|
|
|
|
# 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 [[ "$feature_segment" =~ ^[0-9]{3,}- ]] && [[ ! "$feature_segment" =~ ^[0-9]{7}-[0-9]{6}- ]] && [[ ! "$feature_segment" =~ ^[0-9]{7,8}-[0-9]{6}$ ]]; then
|
|
is_sequential=true
|
|
fi
|
|
if [[ "$is_sequential" != "true" ]] && [[ ! "$feature_segment" =~ ^[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, 20260319-143022-feature-name, or <prefix>/001-feature-name" >&2
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|