Skip to content

🤖 fix: use git show-branch for clearer SSH workspace force delete errors #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2025
Merged

🤖 fix: use git show-branch for clearer SSH workspace force delete errors #530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37a58e2
🤖 fix: use git show-branch for clearer SSH workspace force delete errors
ammar-agent Nov 7, 2025
57b3401
fix: only show show-branch when commits are truly unpushed
ammar-agent Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 25 additions & 1 deletion src/runtime/SSHRuntime.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,9 +985,33 @@ export class SSHRuntime implements Runtime {
cd ${shescape.quote(deletedPath)} || exit 1
git diff --quiet --exit-code && git diff --quiet --cached --exit-code || exit 1
if git remote | grep -q .; then
# First, check the original condition: any commits not in any remote
unpushed=$(git log --branches --not --remotes --oneline)
if [ -n "$unpushed" ]; then
echo "$unpushed" | head -10 >&2
# Get current branch for better error messaging
BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)

# Get default branch (try origin/HEAD, fallback to main, then master)
DEFAULT=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@')
if [ -z "$DEFAULT" ]; then
if git rev-parse --verify origin/main >/dev/null 2>&1; then
DEFAULT="main"
elif git rev-parse --verify origin/master >/dev/null 2>&1; then
DEFAULT="master"
fi
fi

# If we have both branch and default, use show-branch for better output
if [ -n "$BRANCH" ] && [ -n "$DEFAULT" ] && git show-branch "$BRANCH" "origin/$DEFAULT" >/dev/null 2>&1; then
echo "Branch status compared to origin/$DEFAULT:" >&2
echo "" >&2
git show-branch "$BRANCH" "origin/$DEFAULT" 2>&1 | head -20 >&2
echo "" >&2
echo "Note: If your PR was squash-merged, these commits are already in origin/$DEFAULT and safe to delete." >&2
else
# Fallback to just showing the commit list
echo "$unpushed" | head -10 >&2
fi
exit 2
fi
fi
Expand Down