Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions cmd/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ func detectSyncIssues(gitClient git.GitClient, stackBranches []stack.StackBranch
if verbose {
fmt.Printf(" ✗ PR base (%s) doesn't match configured parent (%s)\n", pr.Base, branch.Parent)
}
issues = append(issues, fmt.Sprintf(" - Branch '%s' PR base (%s) doesn't match parent (%s)", branch.Name, pr.Base, branch.Parent))
issues = append(issues, fmt.Sprintf(" - Branch '%s' PR base (%s) doesn't match parent (%s)", ui.Branch(branch.Name), ui.Branch(pr.Base), ui.Branch(branch.Parent)))
} else if verbose {
fmt.Printf(" ✓ PR base matches configured parent\n")
}
Expand All @@ -383,7 +383,7 @@ func detectSyncIssues(gitClient git.GitClient, stackBranches []stack.StackBranch
if verbose {
fmt.Printf(" ✗ Branch is behind %s (needs rebase)\n", branch.Parent)
}
issues = append(issues, fmt.Sprintf(" - Branch '%s' is behind %s (needs rebase)", branch.Name, branch.Parent))
issues = append(issues, fmt.Sprintf(" - Branch '%s' is behind %s (needs rebase)", ui.Branch(branch.Name), ui.Branch(branch.Parent)))
} else if err == nil && verbose {
fmt.Printf(" ✓ Branch is up to date with %s\n", branch.Parent)
} else if err != nil && verbose {
Expand All @@ -401,7 +401,7 @@ func detectSyncIssues(gitClient git.GitClient, stackBranches []stack.StackBranch
if verbose {
fmt.Printf(" ✗ Local branch differs from origin/%s (needs push)\n", branch.Name)
}
issues = append(issues, fmt.Sprintf(" - Branch '%s' differs from origin (needs push)", branch.Name))
issues = append(issues, fmt.Sprintf(" - Branch '%s' differs from origin (needs push)", ui.Branch(branch.Name)))
} else if localErr == nil && remoteErr == nil && verbose {
fmt.Printf(" ✓ Local branch matches origin/%s\n", branch.Name)
} else if verbose {
Expand Down
4 changes: 2 additions & 2 deletions internal/ui/color.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ func ErrorText(msg string) string {
return red.Sprint(msg)
}

// Command returns a command in cyan (for help text)
// Command returns a command in green (for help text)
func Command(cmd string) string {
return cyan.Sprint(cmd)
return green.Sprint(cmd)
}

// Dim returns dimmed/gray text
Expand Down