Delete via api

probablycorey · probablycorey · commit 9113092f5c44 · 2020-05-22T15:19:39.000-07:00
diff --git a/api/queries_pr.go b/api/queries_pr.go
@@ -1014,6 +1014,14 @@ func PullRequestReady(client *Client, repo ghrepo.Interface, pr *PullRequest) er
 	return err
 }
 
+func BranchDeleteRemote(client *Client, repo ghrepo.Interface, branch string) error {
+	var response struct {
+		NodeID string `json:"node_id"`
+	}
+	path := fmt.Sprintf("/repos/%s/%s/git/refs/heads/%s", repo.RepoOwner, repo.RepoName, branch)
+	return client.REST("GET", path, nil, &response)
+}
+
 func min(a, b int) int {
 	if a < b {
 		return a
diff --git a/command/pr.go b/command/pr.go
@@ -586,7 +586,7 @@ func prMerge(cmd *cobra.Command, args []string) error {
 			}
 		}
 
-		err = git.DeleteRemoteBranch(pr.HeadRefName)
+		err = api.BranchDeleteRemote(apiClient, baseRepo, pr.HeadRefName)
 		if err != nil {
 			err = fmt.Errorf("failed to delete remote branch %s: %w", utils.Cyan(pr.HeadRefName), err)
 			return err
diff --git a/git/git.go b/git/git.go
@@ -209,12 +209,6 @@ func DeleteLocalBranch(branch string) error {
 	return err
 }
 
-func DeleteRemoteBranch(branch string) error {
-	configCmd := GitCommand("push", "origin", "--delete", branch)
-	_, err := run.PrepareCmd(configCmd).Output()
-	return err
-}
-
 func HasLocalBranch(branch string) bool {
 	configCmd := GitCommand("rev-parse", "--verify", "refs/heads/"+branch)
 	_, err := run.PrepareCmd(configCmd).Output()

Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ func prMerge(cmd *cobra.Command, args []string) error {`
`586`	`586`	`}`
`587`	`587`	`}`
`588`	`588`
`589`		`- err = git.DeleteRemoteBranch(pr.HeadRefName)`
	`589`	`+ err = api.BranchDeleteRemote(apiClient, baseRepo, pr.HeadRefName)`
`590`	`590`	`if err != nil {`
`591`	`591`	`err = fmt.Errorf("failed to delete remote branch %s: %w", utils.Cyan(pr.HeadRefName), err)`
`592`	`592`	`return err`