Skip to content

fix: preserve branch names with "/" in switch_branch #4486

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

Open
fabio-silva wants to merge 1 commit into
base: v3
Choose a base branch
from
Open

fix: preserve branch names with "/" in switch_branch #4486

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ci.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,13 @@ def switch_branch(path, branch):
cur_branch = check_output('git rev-parse HEAD'.split(), cwd=path).decode().strip()
if cur_branch != branch:
branches = check_output('git ls-remote --heads origin'.split(), cwd=path)
branches = [line.split("/")[-1] for line in branches.decode().strip().split("\n")]
# Prefer refs/heads/<name> so branch names containing "/" (e.g. cursor/foo)
# are preserved; split("/")[-1] would keep only the last path segment.
branches = [
line.split("refs/heads/", 1)[-1]
for line in branches.decode().strip().split("\n")
if line.strip()
]

if branch in branches:
print(f'Switch to branch: {branch} (from {cur_branch})')
Expand Down
Loading