🤖 fix: detect squash-merged branches for SSH workspace deletion #852
Conversation
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
|
Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits. |
ammar-agent
force-pushed
the
ssh-workspace-squash-deletion
branch
8 times, most recently
from
499a44e to
298a424
Compare
SSH workspaces required force deletion after squash-merging PRs because the check used 'git log --branches --not --remotes' which always shows commits for squash-merged branches (original commits differ from the squash commit SHA). Added content-based comparison when unpushed commits are detected: - Fetch latest default branch from origin - Get files changed on branch since merge-base - Compare each file's content between HEAD and origin/$DEFAULT - If all files match, treat as merged (squash-merge case) Also prefer origin/main or origin/master over origin/HEAD for default branch detection, since origin/HEAD can point to feature branches in some repo configurations. Includes integration tests for both squash-merge detection and ensuring genuinely unmerged content is still blocked.
ammar-agent
force-pushed
the
ssh-workspace-squash-deletion
branch
from
298a424 to
b80e01f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
SSH workspaces required force deletion after squash-merging PRs because the check used
git log --branches --not --remoteswhich always shows commits for squash-merged branches (original commits differ from squash commit SHA).Solution: Added content-based comparison when unpushed commits are detected:
origin/$DEFAULTThis allows clean deletion of squash-merged branches without forcing, while still protecting branches with real uncommitted work.
Generated with
mux