fix(426): narrow merge verification exclude to .storkit/work/ only
The post-cherry-pick diff check was excluding all of .storkit/, which rejected stories whose deliverable is .storkit/project.toml changes (e.g. 431 updating QA agent prompts). Narrow the exclusion to .storkit/work/ which is where pipeline file moves live. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -419,9 +419,10 @@ pub(crate) fn run_squash_merge(
|
||||
}
|
||||
|
||||
// Verify HEAD commit has actual code changes (not an empty cherry-pick).
|
||||
// Exclude .storkit/ so that story-file-only commits don't pass this check.
|
||||
// Exclude .storkit/work/ (pipeline file moves) but keep .storkit/project.toml
|
||||
// and other config files which are legitimate deliverables.
|
||||
let diff_stat = Command::new("git")
|
||||
.args(["diff", "--stat", "HEAD~1..HEAD", "--", ".", ":(exclude).storkit"])
|
||||
.args(["diff", "--stat", "HEAD~1..HEAD", "--", ".", ":(exclude).storkit/work"])
|
||||
.current_dir(project_root)
|
||||
.output()
|
||||
.map(|o| String::from_utf8_lossy(&o.stdout).trim().to_string())
|
||||
|
||||
Reference in New Issue
Block a user