Skip to content

ensure-working-branch: scope stash-freshness check to current branch - #87

Open
jodavis-claude wants to merge 1 commit into
mainfrom
dev/claude/ADR-341-ensure-working-branch-stash-scope
Open

ensure-working-branch: scope stash-freshness check to current branch#87
jodavis-claude wants to merge 1 commit into
mainfrom
dev/claude/ADR-341-ensure-working-branch-stash-scope

Conversation

@jodavis-claude

Copy link
Copy Markdown
Collaborator

Summary

  • git stash refs are shared repo-wide across every worktree, not scoped per-worktree
  • The worktree-freshness hard-stop in ensure-working-branch step 1 was failing on any non-empty git stash list, even entries left behind by unrelated past/concurrent sessions on other branches
  • Filters the check to stash entries referencing the current branch only

Context

Found while running concurrent-orchestrate for ADR-341 in AdaptiveRemote: the check hard-stopped on 6 stale stash entries from unrelated prior sessions, none belonging to the task's own branch.

Test plan

  • Re-run a task pipeline in a repo with unrelated stashes present on other branches and confirm it no longer hard-stops
  • Confirm a stash entry that does reference the current branch still hard-stops

Co-Authored-By: Claude Sonnet 5 noreply@anthropic.com

git stash refs are shared repo-wide across every worktree, not scoped
per-worktree. Any leftover stash entry from an unrelated past or
concurrent session was hard-stopping every new task's freshness check,
even when it had nothing to do with that task's branch. Filter to
entries referencing the current branch instead.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@github-actions

Copy link
Copy Markdown

build-and-test: Python test results

Status: ✅ Passed

Test log

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants