Skip to content

feat: enhance branch cleanup to identify and handle local branches without upstream #19

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
sergiotejon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: enhance branch cleanup to identify and handle local branches without upstream #19

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
101 changes: 93 additions & 8 deletions cmd/branches.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ type Branch struct {
}

const unmergedPrefix = "(!) "
const localUnmergedPrefix = "(*) "

var branchesCmd = &cobra.Command{
Use: "branches",
Expand Down Expand Up @@ -115,6 +116,13 @@ func runCleanup() {
}
}

// Detectar ramas sin upstream
branchesWithoutUpstream, err := getBranchesWithoutUpstream()
if err != nil {
fmt.Printf("⚠️ Warning: Failed to detect branches without upstream: %v\n", err)
branchesWithoutUpstream = make(map[string]bool)
}

// Track unmerged branches if -u flag is set
unmergedBranchesMap := make(map[string]bool)
if includeUnmerged {
Expand All @@ -132,12 +140,25 @@ func runCleanup() {
}

// Convert maps to display list
// Local branches (without upstream) are treated as unmerged even if merged
var branchesToDelete []string

@Muriano Muriano Feb 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BLOQUEANTE: Las ramas merged que no tienen upstream se tratan como 'unmerged' y requieren confirmación DELETE. Esto es incorrecto: si una rama ya está merged en la rama por defecto, es segura para borrar independientemente de si tiene upstream o no.

Ejemplo del problema:

  1. Se crea feature-x localmente, se hace merge a main vía PR
  2. La rama local no tiene upstream (nunca se hizo push o el upstream fue borrado)
  3. getMergedBranches() la identifica correctamente como merged → entra en safeToDeleteMap
  4. Pero como branchesWithoutUpstream[branch] es true → se le añade el prefijo (*) y requiere confirmación DELETE

Solución: Las ramas en safeToDeleteMap deberían permanecer como safe independientemente de su estado de upstream. Solo aplicar la lógica de localUnmergedPrefix a ramas que NO estén en safeToDeleteMap.

localBranchesCount := 0
for branch := range safeToDeleteMap {
branchesToDelete = append(branchesToDelete, branch)
if branchesWithoutUpstream[branch] {
// Local branch without upstream -> treat as unmerged
branchesToDelete = append(branchesToDelete, localUnmergedPrefix+branch)
localBranchesCount++
} else {
branchesToDelete = append(branchesToDelete, branch)
}
}
for branch := range unmergedBranchesMap {
branchesToDelete = append(branchesToDelete, unmergedPrefix+branch)
if branchesWithoutUpstream[branch] {
branchesToDelete = append(branchesToDelete, localUnmergedPrefix+branch)
localBranchesCount++
} else {
branchesToDelete = append(branchesToDelete, unmergedPrefix+branch)
}
}

if len(branchesToDelete) == 0 {
Expand All @@ -156,12 +177,21 @@ func runCleanup() {
fmt.Printf(" • %d branches merged into %s\n", len(mergedBranches), defaultBranch)
}
if len(unmergedBranchesMap) > 0 {
fmt.Printf(" • %d unmerged branches ((!) requires confirmation)\n", len(unmergedBranchesMap))
fmt.Printf(" • %d unmerged branches (requires confirmation)\n", len(unmergedBranchesMap))
}
if localBranchesCount > 0 {
fmt.Printf(" • %d local branches without remote (requires confirmation)\n", localBranchesCount)
}

// Show legend if there are unmerged branches
if len(unmergedBranchesMap) > 0 {
fmt.Println("\n (!) Unmerged")
// Show legend if there are special branches
if len(unmergedBranchesMap) > 0 || localBranchesCount > 0 {
fmt.Println("\n Legend:")
if len(unmergedBranchesMap) > 0 {
fmt.Println(" (!) Unmerged (has remote)")
}
if localBranchesCount > 0 {
fmt.Println(" (*) Local only (no remote)")
}
}

// Select branches: use all if -a flag is set, otherwise use interactive fzf
Expand All @@ -188,9 +218,12 @@ func runCleanup() {
// Separate unmerged branches from safe branches
var safeBranches []string
var unmergedSelected []string
var localUnmergedSelected []string
for _, branch := range selectedBranches {
if strings.HasPrefix(branch, unmergedPrefix) {
unmergedSelected = append(unmergedSelected, strings.TrimPrefix(branch, unmergedPrefix))
} else if strings.HasPrefix(branch, localUnmergedPrefix) {
localUnmergedSelected = append(localUnmergedSelected, strings.TrimPrefix(branch, localUnmergedPrefix))
} else {
safeBranches = append(safeBranches, branch)
}
Expand All @@ -204,6 +237,9 @@ func runCleanup() {
for _, branch := range unmergedSelected {
fmt.Printf(" • %s%s (local + remote)\n", unmergedPrefix, branch)
}
for _, branch := range localUnmergedSelected {
fmt.Printf(" • %s%s (local only)\n", localUnmergedPrefix, branch)
}

// Confirm deletion for safe branches (unless --force is used)
if len(safeBranches) > 0 && !forceDelete {
Expand All @@ -219,11 +255,15 @@ func runCleanup() {
}

// Always confirm unmerged branches (even with -f)
if len(unmergedSelected) > 0 {
fmt.Printf("\n🚨 WARNING: You are about to delete %d UNMERGED branch(es):\n", len(unmergedSelected))
totalUnmerged := len(unmergedSelected) + len(localUnmergedSelected)
if totalUnmerged > 0 {
fmt.Printf("\n🚨 WARNING: You are about to delete %d UNMERGED branch(es):\n", totalUnmerged)
for _, branch := range unmergedSelected {
fmt.Printf(" • %s (will be deleted locally AND from remote)\n", branch)
}
for _, branch := range localUnmergedSelected {
fmt.Printf(" • %s (local only)\n", branch)
}
fmt.Print("\n⚠️ This action cannot be undone! Type 'DELETE' to confirm: ")
reader := bufio.NewReader(os.Stdin)
response, _ := reader.ReadString('\n')
Expand All @@ -234,6 +274,7 @@ func runCleanup() {
// Still delete safe branches if force was used
if forceDelete && len(safeBranches) > 0 {
unmergedSelected = []string{}
localUnmergedSelected = []string{}
} else {
return
}
Expand Down Expand Up @@ -261,6 +302,16 @@ func runCleanup() {
}
}

// Delete local unmerged branches (force delete, local only)

@Muriano Muriano Feb 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BLOQUEANTE: Una rama merged que recibe el prefijo (*) acaba en localUnmergedSelected y se borra con forceDeleteLocalBranch() (git branch -D). Para una rama ya merged, con git branch -d bastaría y es más seguro. Esto es consecuencia directa del problema anterior: ramas merged sin upstream se categorizan incorrectamente.

for _, branch := range localUnmergedSelected {
if err := forceDeleteLocalBranch(branch); err != nil {
fmt.Printf("❌ Failed to delete branch %s: %v\n", branch, err)
} else {
fmt.Printf("✅ Deleted branch (local only): %s\n", branch)
deletedCount++
}
}

fmt.Printf("\n🎉 Successfully deleted %d branches\n", deletedCount)
}

Expand Down Expand Up @@ -446,6 +497,40 @@ func getAllLocalBranches() ([]string, error) {
return branches, nil
}

func getBranchesWithoutUpstream() (map[string]bool, error) {
cmd := exec.Command("git", "branch", "--format", "%(refname:short) %(upstream)")
cmd.Env = append(os.Environ(), "LC_ALL=C")
output, err := cmd.Output()
if err != nil {
return nil, err
}

noUpstream := make(map[string]bool)
lines := strings.Split(string(output), "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if line == "" {
continue
}
parts := strings.Fields(line)
if len(parts) == 1 {
// Solo tiene nombre, no tiene upstream
noUpstream[parts[0]] = true
}

@Muriano Muriano Feb 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sugerencia (defensa en profundidad): La función getBranchesWithoutUpstream() no excluye la rama actual ni la rama por defecto. Aunque estas nunca acaban en safeToDeleteMap ni en unmergedBranchesMap, sería más seguro excluirlas explícitamente aquí para evitar problemas futuros si la lógica de arriba cambia.

if len(parts) == 1 && parts[0] != defaultBranch && parts[0] != currentBranch {
    noUpstream[parts[0]] = true
}

}
return noUpstream, nil
}

func forceDeleteLocalBranch(branch string) error {
cmd := exec.Command("git", "branch", "-D", branch)
cmd.Env = append(os.Environ(), "LC_ALL=C")
output, err := cmd.CombinedOutput()
if err != nil {
return fmt.Errorf("%s", string(output))
}
return nil
}

func deleteBranchWithRemote(branch string) error {
// First try to delete remote branch
cmd := exec.Command("git", "push", "origin", "--delete", branch)
Expand Down
Loading