Repository navigation
overlap_guard: a worktree on its merged PR head holds only uncommitted files - #902
Merged
Merged
Conversation
…d files A squash-merged branch's commits look unmerged, and once main changes the same files again they differ from main, so the guard blamed a finished worktree (grok/worker-replay, merged as #898) for TICKET.md. A worktree whose branch still sits on the head its PR merged now counts only its uncommitted files. Checked both ways: that case passes; an unmerged codex/ probe branch touching README.md still stops the commit. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FFKdv4nqKXKM9d5Cf2hEFk
…nnot be listed Review fixes (Standards, Spec). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FFKdv4nqKXKM9d5Cf2hEFk
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
scripts/dev/overlap_guard.shstopped a commit to.planning/workstreams/whole-source-census/TICKET.mdbecause Grok'sgrok/worker-replayworktree still exists. That branch was squash-merged as #898, so its commits look unmerged, and main has changedTICKET.mdsince.With this change, a worktree whose branch still sits on the exact head commit its PR merged counts only its uncommitted files.
Checked
TICKET.mdcase: the old guard stops (exit 1), the new guard passes (exit 0).codex/branch in its own worktree, changingREADME.md, still stops a commit that touchesREADME.md(exit 1). The probe was removed afterwards.shellcheck -S warningis clean.Review (Standards, Spec, GoF)
refs/heads/<name>, so a tag with the same name cannot match; and a failed listing of merged PRs prints a note.🤖 Generated with Claude Code
https://claude.ai/code/session_01FFKdv4nqKXKM9d5Cf2hEFk