From 858cd705abd100667a9ad4149fd46d00628e5162 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Fri, 22 May 2020 15:07:39 -0700 Subject: [PATCH] Update name --- command/pr.go | 2 +- git/git.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/command/pr.go b/command/pr.go index bd51858ae..216671a40 100644 --- a/command/pr.go +++ b/command/pr.go @@ -569,7 +569,7 @@ func prMerge(cmd *cobra.Command, args []string) error { } } - localBranchExists := git.DoesLocalBranchExist(pr.HeadRefName) + localBranchExists := git.HasLocalBranch(pr.HeadRefName) if localBranchExists { err = git.DeleteLocalBranch(pr.HeadRefName) if err != nil { diff --git a/git/git.go b/git/git.go index e36fa6f4f..c1a8bd619 100644 --- a/git/git.go +++ b/git/git.go @@ -215,7 +215,7 @@ func DeleteRemoteBranch(branch string) error { return err } -func DoesLocalBranchExist(branch string) bool { +func HasLocalBranch(branch string) bool { configCmd := GitCommand("rev-parse", "--verify", "refs/heads/"+branch) _, err := run.PrepareCmd(configCmd).Output() return err == nil