delete remote tracking ref too

Author: skarim

cmd/sync.go

@@ -417,6 +417,9 @@ func runSync(cfg *config.Config, opts *syncOptions) error {
 				if err := git.DeleteBranch(name, true); err != nil {
 					cfg.Warningf("Failed to delete %s: %v", name, err)
 				} else {
+					// Also remove the remote-tracking ref so that
+					// `git checkout <name>` doesn't recreate the branch.
+					_ = git.DeleteTrackingRef(remote, name)
 					cfg.Successf("Pruned %s (merged)", name)
 					pruned++
 				}

internal/git/git.go

@@ -312,6 +312,11 @@ func DeleteRemoteBranch(remote, branch string) error {
 	return ops.DeleteRemoteBranch(remote, branch)
 }
 
+// DeleteTrackingRef deletes a local remote-tracking ref (e.g. refs/remotes/origin/branch).
+func DeleteTrackingRef(remote, branch string) error {
+	return ops.DeleteTrackingRef(remote, branch)
+}
+
 // ResetHard resets the current branch to the given ref.
 func ResetHard(ref string) error {
 	return ops.ResetHard(ref)

internal/git/gitops.go

@@ -48,6 +48,7 @@ type Ops interface {
 	DiffStatFiles(base, head string) ([]FileDiffStat, error)
 	DeleteBranch(name string, force bool) error
 	DeleteRemoteBranch(remote, branch string) error
+	DeleteTrackingRef(remote, branch string) error
 	ResetHard(ref string) error
 	SetUpstreamTracking(branch, remote string) error
 	MergeFF(target string) error
@@ -485,6 +486,10 @@ func (d *defaultOps) DeleteRemoteBranch(remote, branch string) error {
 	return runSilent("push", remote, "--delete", branch)
 }
 
+func (d *defaultOps) DeleteTrackingRef(remote, branch string) error {
+	return runSilent("branch", "-dr", remote+"/"+branch)
+}
+
 func (d *defaultOps) ResetHard(ref string) error {
 	return runSilent("reset", "--hard", ref)
 }

internal/git/mock_ops.go

@@ -36,6 +36,7 @@ type MockOps struct {
 	DiffStatFilesFn         func(string, string) ([]FileDiffStat, error)
 	DeleteBranchFn          func(string, bool) error
 	DeleteRemoteBranchFn    func(string, string) error
+	DeleteTrackingRefFn     func(string, string) error
 	ResetHardFn             func(string) error
 	SetUpstreamTrackingFn   func(string, string) error
 	MergeFFFn               func(string) error
@@ -287,6 +288,13 @@ func (m *MockOps) DeleteRemoteBranch(remote, branch string) error {
 	return nil
 }
 
+func (m *MockOps) DeleteTrackingRef(remote, branch string) error {
+	if m.DeleteTrackingRefFn != nil {
+		return m.DeleteTrackingRefFn(remote, branch)
+	}
+	return nil
+}
+
 func (m *MockOps) ResetHard(ref string) error {
 	if m.ResetHardFn != nil {
 		return m.ResetHardFn(ref)