Skip to content

switch command #51

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
skarim merged 5 commits into from
Apr 20, 2026
Merged

switch command #51

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fcf8c8b
switch cmd to interactively switch to another branch in the stack
skarim Apr 17, 2026
e4e91b6
add switch to docs
skarim Apr 17, 2026
caed616
addressing review comments
skarim Apr 17, 2026
3ca24e8
bump skill file version
skarim Apr 17, 2026
e86589d
default to current branch
skarim Apr 17, 2026
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
Prev Previous commit
default to current branch
  • Loading branch information
@skarim
skarim committed Apr 18, 2026
commit e86589da2d26597c27b236e757613e1eb412cd0c
9 changes: 6 additions & 3 deletions cmd/switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,14 @@ func runSwitch(cfg *config.Config) error {
// Build options in reverse order (top of stack first) with 1-based numbering.
n := len(s.Branches)
options := make([]string, n)
currentBranch := result.CurrentBranch
var defaultOpt string
for i := 0; i < n; i++ {
branchIdx := n - 1 - i
options[i] = fmt.Sprintf("%d. %s", branchIdx+1, s.Branches[branchIdx].Branch)
if s.Branches[branchIdx].Branch == currentBranch {
defaultOpt = options[i]
}
}

var selectFn func(prompt, def string, opts []string) (int, error)
Expand All @@ -60,7 +65,7 @@ func runSwitch(cfg *config.Config) error {
}
}

selected, err := selectFn("Select a branch in the stack to switch to:", "", options)
selected, err := selectFn("Select a branch in the stack to switch to:", defaultOpt, options)
if err != nil {
if isInterruptError(err) {
clearSelectPrompt(cfg, len(options))
Expand All @@ -79,8 +84,6 @@ func runSwitch(cfg *config.Config) error {
// Map selection back: index 0 in options = branch at n-1, etc.
branchIdx := n - 1 - selected
targetBranch := s.Branches[branchIdx].Branch
Comment thread
skarim marked this conversation as resolved.

currentBranch := result.CurrentBranch
if targetBranch == currentBranch {
cfg.Infof("Already on %s", targetBranch)
return nil
Expand Down