Skip to content

Fix current branch tracking after deletion #1

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
him0 merged 1 commit into from
Jul 16, 2025
Merged

Fix current branch tracking after deletion #1

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
9 changes: 5 additions & 4 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func main() {
fullDefaultBranch := fmt.Sprintf("refs/remotes/%s/%s", remote.Name, defaultBranch)

for _, branch := range branches {
processBranch(branch, remote, branchToRemote, currentBranch, defaultBranch, fullDefaultBranch)
processBranch(branch, remote, branchToRemote, &currentBranch, defaultBranch, fullDefaultBranch)
}
}

Expand Down Expand Up @@ -227,7 +227,7 @@ func getLocalBranches() ([]string, error) {
return branches, nil
}

func processBranch(branch string, remote *Remote, branchToRemote map[string]string, currentBranch, defaultBranch, fullDefaultBranch string) {
func processBranch(branch string, remote *Remote, branchToRemote map[string]string, currentBranch *string, defaultBranch, fullDefaultBranch string) {
fullBranch := fmt.Sprintf("refs/heads/%s", branch)
remoteBranch := fmt.Sprintf("refs/remotes/%s/%s", remote.Name, branch)
gone := false
Expand Down Expand Up @@ -255,7 +255,7 @@ func processBranch(branch string, remote *Remote, branchToRemote map[string]stri
} else if ahead == 0 && behind > 0 {
// Local branch is behind, can fast-forward
oldCommit := getCommitSHA(fullBranch)
if branch == currentBranch {
if branch == *currentBranch {
runGitSilent("merge", "--ff-only", "--quiet", remoteBranch)
} else {
runGitSilent("update-ref", fullBranch, remoteBranch)
Expand All @@ -272,8 +272,9 @@ func processBranch(branch string, remote *Remote, branchToRemote map[string]stri
if ahead == 0 && behind >= 0 {
// Branch is ancestor of default branch, safe to delete
oldCommit := getCommitSHA(fullBranch)
if branch == currentBranch {
if branch == *currentBranch {
runGitSilent("checkout", "--quiet", defaultBranch)
*currentBranch = defaultBranch
}
runGitSilent("branch", "-D", branch)
fmt.Printf("%sDeleted branch %s%s%s (was %s).\n", red, lightRed, branch, resetColor, oldCommit[:7])
Expand Down