crashlabs/huskies
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

fix(426): also narrow pre-cherry-pick code change check to .storkit/work/

Browse Source 
There were two places checking for code changes: the post-cherry-pick
verification (already fixed) and a pre-cherry-pick check in the
merge-queue worktree. The pre-cherry-pick check was still filtering
all of .storkit/ which rejected stories that only change project.toml.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
dave
2026-03-28 15:27:19 +00:00
parent fc160b5c5f
commit 361f9dff0d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/agents/merge.rs
+1 -1
View File
@@ -247,7 +247,7 @@ pub(crate) fn run_squash_merge(
.output() .output()
.map_err(|e| format!("Failed to check merge diff: {e}"))?; .map_err(|e| format!("Failed to check merge diff: {e}"))?;
let changed_files = String::from_utf8_lossy(&diff_check.stdout); let changed_files = String::from_utf8_lossy(&diff_check.stdout);
let has_code_changes = changed_files.lines().any(|f| !f.starts_with(".storkit/")); let has_code_changes = changed_files.lines().any(|f| !f.starts_with(".storkit/work/"));
if !has_code_changes { if !has_code_changes {
all_output.push_str( all_output.push_str(
"=== Merge commit contains only .storkit/ file moves, no code changes ===\n", "=== Merge commit contains only .storkit/ file moves, no code changes ===\n",