fix: the branch list now show remote branches correctly

Author: FredrikMWold

internal/git/git.go

@@ -107,20 +107,31 @@ type Branch struct {
 	IsRemote  bool
 	Remote    string // e.g. "origin" if remote
 	RemoteRef string // e.g. "origin/feature"
+	// For local branches, the upstream they're tracking (e.g. "origin/master"). Empty if none.
+	Upstream string
 }
 
 // ListBranchesDetailed returns local and remote branches, with local first.
 func ListBranchesDetailed() ([]Branch, error) {
-	var branches []Branch
-	// Local branches, sorted by most recent committer date
-	outLocal, err := runGit("for-each-ref", "--sort=-committerdate", "--format=%(refname:short)", "refs/heads")
+	// Collect locals and remotes separately
+	var locals []Branch
+	var remotes []Branch
+
+	// Local branches, sorted by most recent committer date, include upstream tracking info
+	// Format: "<name>\t<upstream>" where upstream is short (like origin/master) or empty
+	outLocal, err := runGit("for-each-ref", "--sort=-committerdate", "--format=%(refname:short)\t%(upstream:short)", "refs/heads")
 	if err == nil {
 		for _, l := range strings.Split(strings.TrimSpace(outLocal), "\n") {
-			l = strings.TrimSpace(l)
-			if l == "" {
+			if strings.TrimSpace(l) == "" {
 				continue
 			}
-			branches = append(branches, Branch{Name: l})
+			name := l
+			upstream := ""
+			if tab := strings.Index(l, "\t"); tab != -1 {
+				name = strings.TrimSpace(l[:tab])
+				upstream = strings.TrimSpace(l[tab+1:])
+			}
+			locals = append(locals, Branch{Name: name, Upstream: upstream})
 		}
 	}
 	// Remote branches (skip HEAD pointers like origin/HEAD), sorted by most recent committer date
@@ -141,10 +152,26 @@ func ListBranchesDetailed() ([]Branch, error) {
 			}
 			remote := parts[0]
 			name := parts[1]
-			branches = append(branches, Branch{Name: name, IsRemote: true, Remote: remote, RemoteRef: l})
+			remotes = append(remotes, Branch{Name: name, IsRemote: true, Remote: remote, RemoteRef: l})
 		}
 	}
-	return branches, nil
+
+	// Deduplicate: prefer locals; include at most one remote per short name when no local exists
+	final := make([]Branch, 0, len(locals)+len(remotes))
+	seen := make(map[string]struct{})
+	for _, b := range locals {
+		final = append(final, b)
+		seen[b.Name] = struct{}{}
+	}
+	for _, b := range remotes {
+		if _, ok := seen[b.Name]; ok {
+			continue // local exists; skip remote duplicate
+		}
+		// Ensure only one remote per short name
+		seen[b.Name] = struct{}{}
+		final = append(final, b)
+	}
+	return final, nil
 }
 
 // CreateWorktreeFromRef creates a new branch from a given ref and adds a worktree.

internal/tui/model.go

@@ -288,23 +288,22 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, m.branches.NewStatusMessage(fmt.Sprintf("Error: %v", msg.err))
 		}
 		items := make([]list.Item, 0, len(msg.branches)+1)
-		labelType := func(s string) string { return lipgloss.NewStyle().Foreground(theme.Peach).Render(s) }
-		labelRemote := func(s string) string { return lipgloss.NewStyle().Foreground(theme.Sky).Render(s) }
+		labelTrack := func(s string) string { return lipgloss.NewStyle().Foreground(theme.Blue).Render(s) }
+		labelMuted := func(s string) string { return lipgloss.NewStyle().Foreground(theme.Surface1).Render(s) }
 		value := func(s string) string { return s }
 		// Prepend synthetic option to create a new branch
 		items = append(items, item{title: "[+] Create new branch", desc: "Type a new branch name", isAdd: true})
 		for _, b := range msg.branches {
-			// Title: branch name; Desc: labeled status
-			var segs []string
-			if b.IsRemote {
-				segs = append(segs, labelType("Type:")+" "+value("remote"))
-				if b.Remote != "" {
-					segs = append(segs, labelRemote("Remote:")+" "+value(b.Remote))
+			// Title: branch name; Desc: show tracking info for locals; gray 'no remote' if none
+			desc := ""
+			if !b.IsRemote {
+				up := strings.TrimSpace(b.Upstream)
+				if up == "" {
+					desc = labelMuted("No remote")
+				} else {
+					desc = labelTrack("Tracking:") + " " + value(up)
 				}
-			} else {
-				segs = append(segs, labelType("Type:")+" "+value("local"))
 			}
-			desc := strings.Join(segs, "  ")
 			items = append(items, item{title: b.Name, desc: desc, br: b})
 		}
 		m.branches.SetItems(items)