pr close skips deleting local branch if not in a git repo

ganboonhong · ganboonhong · commit a6161cb8cb97 · 2022-02-26T18:03:05.000+08:00
diff --git a/pkg/cmd/pr/close/close.go b/pkg/cmd/pr/close/close.go
@@ -90,34 +90,36 @@ func closeRun(opts *CloseOptions) error {
 	if opts.DeleteBranch {
 		branchSwitchString := ""
 		apiClient := api.NewClientFromHTTP(httpClient)
+		localBranchExists := git.HasLocalBranch(pr.HeadRefName)
 
 		if opts.DeleteLocalBranch {
-			currentBranch, err := opts.Branch()
-			if err != nil {
-				return err
-			}
-
-			var branchToSwitchTo string
-			if currentBranch == pr.HeadRefName {
-				branchToSwitchTo, err = api.RepoDefaultBranch(apiClient, baseRepo)
+			if localBranchExists {
+				currentBranch, err := opts.Branch()
 				if err != nil {
 					return err
 				}
-				err = git.CheckoutBranch(branchToSwitchTo)
-				if err != nil {
-					return err
+
+				var branchToSwitchTo string
+				if currentBranch == pr.HeadRefName {
+					branchToSwitchTo, err = api.RepoDefaultBranch(apiClient, baseRepo)
+					if err != nil {
+						return err
+					}
+					err = git.CheckoutBranch(branchToSwitchTo)
+					if err != nil {
+						return err
+					}
 				}
-			}
 
-			localBranchExists := git.HasLocalBranch(pr.HeadRefName)
-			if localBranchExists {
 				if err := git.DeleteLocalBranch(pr.HeadRefName); err != nil {
 					return fmt.Errorf("failed to delete local branch %s: %w", cs.Cyan(pr.HeadRefName), err)
 				}
-			}
 
-			if branchToSwitchTo != "" {
-				branchSwitchString = fmt.Sprintf(" and switched to branch %s", cs.Cyan(branchToSwitchTo))
+				if branchToSwitchTo != "" {
+					branchSwitchString = fmt.Sprintf(" and switched to branch %s", cs.Cyan(branchToSwitchTo))
+				}
+			} else {
+				fmt.Fprintf(opts.IO.ErrOut, "%s Skipped deleting the local branch since current directory is not a git repository \n", cs.WarningIcon())
 			}
 		}
 
diff --git a/pkg/cmd/pr/close/close_test.go b/pkg/cmd/pr/close/close_test.go
@@ -230,3 +230,37 @@ func TestPrClose_deleteBranch_sameBranch(t *testing.T) {
 		✓ Deleted branch trunk and switched to branch main
 	`), output.Stderr())
 }
+
+func TestPrClose_deleteBranch_notInGitRepo(t *testing.T) {
+	http := &httpmock.Registry{}
+	defer http.Verify(t)
+
+	baseRepo, pr := stubPR("OWNER/REPO:main", "OWNER/REPO:trunk")
+	pr.Title = "The title of the PR"
+	shared.RunCommandFinder("96", pr, baseRepo)
+
+	http.Register(
+		httpmock.GraphQL(`mutation PullRequestClose\b`),
+		httpmock.GraphQLMutation(`{"id": "THE-ID"}`,
+			func(inputs map[string]interface{}) {
+				assert.Equal(t, inputs["pullRequestId"], "THE-ID")
+			}),
+	)
+	http.Register(
+		httpmock.REST("DELETE", "repos/OWNER/REPO/git/refs/heads/trunk"),
+		httpmock.StringResponse(`{}`))
+
+	cs, cmdTeardown := run.Stub()
+	defer cmdTeardown(t)
+
+	cs.Register(`git rev-parse --verify refs/heads/trunk`, 128, "could not determine current branch: fatal: not a git repository (or any of the parent directories): .git")
+
+	output, err := runCommand(http, true, `96 --delete-branch`)
+	assert.NoError(t, err)
+	assert.Equal(t, "", output.String())
+	assert.Equal(t, heredoc.Doc(`
+		✓ Closed pull request #96 (The title of the PR)
+		! Skipped deleting the local branch since current directory is not a git repository 
+		✓ Deleted branch trunk
+	`), output.Stderr())
+}
