Only delete local branch if it exists

probablycorey · probablycorey · commit 904c541d2d37 · 2020-05-20T14:19:44.000-07:00
diff --git a/command/pr.go b/command/pr.go
@@ -569,10 +569,13 @@ func prMerge(cmd *cobra.Command, args []string) error {
 			}
 		}
 
-		err = git.DeleteLocalBranch(pr.HeadRefName)
-		if err != nil {
-			fmt.Errorf("failed to delete local branch %s: %w", utils.Cyan(pr.HeadRefName), err)
-			return err
+		localBranchExists := git.DoesLocalBranchExist(pr.HeadRefName)
+		if localBranchExists {
+			err = git.DeleteLocalBranch(pr.HeadRefName)
+			if err != nil {
+				fmt.Errorf("failed to delete local branch %s: %w", utils.Cyan(pr.HeadRefName), err)
+				return err
+			}
 		}
 
 		err = git.DeleteRemoteBranch(pr.HeadRefName)
@@ -583,9 +586,10 @@ func prMerge(cmd *cobra.Command, args []string) error {
 
 		branchSwitchString := ""
 		if branchToSwitchTo != "" {
-			branchSwitchString = fmt.Sprintf("and switched to branch %s", utils.Cyan(branchToSwitchTo))
+			branchSwitchString = fmt.Sprintf(" and switched to branch %s", utils.Cyan(branchToSwitchTo))
 		}
-		fmt.Fprintf(colorableOut(cmd), "%s Deleted branch %s %s\n", utils.Red("✔"), utils.Cyan(pr.HeadRefName), branchSwitchString)
+
+		fmt.Fprintf(colorableOut(cmd), "%s Deleted branch %s%s\n", utils.Red("✔"), utils.Cyan(pr.HeadRefName), branchSwitchString)
 	}
 
 	return nil
diff --git a/git/git.go b/git/git.go
@@ -215,6 +215,13 @@ func DeleteRemoteBranch(branch string) error {
 	return err
 }
 
+func DoesLocalBranchExist(branch string) bool {
+	configCmd := GitCommand("rev-parse", "--verify", branch)
+	x, err := run.PrepareCmd(configCmd).Output()
+	fmt.Printf("🌭 %+v|%+v\n", x, err != nil)
+	return err == nil
+}
+
 func CheckoutBranch(branch string) error {
 	configCmd := GitCommand("checkout", branch)
 	_, err := run.PrepareCmd(configCmd).Output()

Original file line number	Diff line number	Diff line change
`@@ -569,10 +569,13 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`569`	`569`	`}`
`570`	`570`	`}`
`571`	`571`
`572`		`- err = git.DeleteLocalBranch(pr.HeadRefName)`
`573`		`- if err != nil {`
`574`		`- fmt.Errorf("failed to delete local branch %s: %w", utils.Cyan(pr.HeadRefName), err)`
`575`		`- return err`
	`572`	`+ localBranchExists := git.DoesLocalBranchExist(pr.HeadRefName)`
	`573`	`+ if localBranchExists {`
	`574`	`+ err = git.DeleteLocalBranch(pr.HeadRefName)`
	`575`	`+ if err != nil {`
	`576`	`+ fmt.Errorf("failed to delete local branch %s: %w", utils.Cyan(pr.HeadRefName), err)`
	`577`	`+ return err`
	`578`	`+ }`
`576`	`579`	`}`
`577`	`580`
`578`	`581`	`err = git.DeleteRemoteBranch(pr.HeadRefName)`
`@@ -583,9 +586,10 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`583`	`586`
`584`	`587`	`branchSwitchString := ""`
`585`	`588`	`if branchToSwitchTo != "" {`
`586`		`- branchSwitchString = fmt.Sprintf("and switched to branch %s", utils.Cyan(branchToSwitchTo))`
	`589`	`+ branchSwitchString = fmt.Sprintf(" and switched to branch %s", utils.Cyan(branchToSwitchTo))`
`587`	`590`	`}`
`588`		`- fmt.Fprintf(colorableOut(cmd), "%s Deleted branch %s %s\n", utils.Red("✔"), utils.Cyan(pr.HeadRefName), branchSwitchString)`
	`591`	`+`
	`592`	`+ fmt.Fprintf(colorableOut(cmd), "%s Deleted branch %s%s\n", utils.Red("✔"), utils.Cyan(pr.HeadRefName), branchSwitchString)`
`589`	`593`	`}`
`590`	`594`
`591`	`595`	`return nil`