Skip to content

fix(pre-oss): baseline SHA validated as mainline ancestor #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matdev83 merged 1 commit into from
Sep 3, 2026
Merged

fix(pre-oss): baseline SHA validated as mainline ancestor #585

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions tools/kiro/speccheck/residual_ownership_inventory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,20 +106,21 @@ func validateSHAIdentity(root, content string) error {
return fmt.Errorf("resolve git HEAD: %w", err)
}

baselineSHA, err := resolveGitBaselineSHA(root)
if err != nil {
return fmt.Errorf("resolve git baseline: %w", err)
}

var identityErrs []string
if err := checkGitCommitObject(root, implSHA); err != nil {
identityErrs = append(identityErrs, fmt.Sprintf("Implementation SHA %q is not an existing commit object", implSHA))
} else if err := checkGitIsAncestor(root, implSHA, "HEAD"); err != nil {
identityErrs = append(identityErrs, fmt.Sprintf("Implementation SHA %q is not an ancestor of git HEAD %q", implSHA, headSHA))
}

if !strings.EqualFold(baseSHA, baselineSHA) {
identityErrs = append(identityErrs, fmt.Sprintf("Merged-Main Baseline SHA %q does not match git baseline (main or origin/main) %q", baseSHA, baselineSHA))
// Baseline must be an existing mainline commit and an ancestor of HEAD.
// Equality with the current main tip is NOT required: pinning equality
// would invalidate the artifact on every future main commit (treadmill),
// while ancestry keeps the recorded base verifiable forever.
if err := checkGitCommitObject(root, baseSHA); err != nil {
identityErrs = append(identityErrs, fmt.Sprintf("Merged-Main Baseline SHA %q is not an existing commit object (baseline must name a mainline commit)", baseSHA))
} else if err := checkGitIsAncestor(root, baseSHA, "HEAD"); err != nil {
identityErrs = append(identityErrs, fmt.Sprintf("Merged-Main Baseline SHA %q is not an ancestor of git HEAD %q (baseline is not a mainline base)", baseSHA, headSHA))
}

if len(identityErrs) > 0 {
Expand Down