Merge remote-tracking branch 'origin/merge-interactive-merge' into remote-delete

probablycorey · probablycorey · commit e643765027e1 · 2020-05-22T15:09:29.000-07:00
diff --git a/command/pr.go b/command/pr.go
@@ -549,7 +549,7 @@ func prMerge(cmd *cobra.Command, args []string) error {
 
 	fmt.Fprintf(colorableOut(cmd), "%s %s pull request #%d\n", utils.Magenta("✔"), action, pr.Number)
 
-	if deleteBranch {
+	if deleteBranch && !cmd.Flags().Changed("repo") {
 		repo, err := api.GitHubRepo(apiClient, baseRepo)
 		if err != nil {
 			return err
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -1017,6 +1017,31 @@ func TestPrMerge(t *testing.T) {
 	}
 }
 
+func TestPrMerge_withRepoFlag(t *testing.T) {
+	initBlankContext("", "OWNER/REPO", "master")
+	http := initFakeHTTP()
+	http.StubResponse(200, bytes.NewBufferString(`{ "data": { "repository": {
+			"pullRequest": { "number": 1, "closed": false, "state": "OPEN"}
+		} } }`))
+	http.StubResponse(200, bytes.NewBufferString(`{"id": "THE-ID"}`))
+
+	cs, cmdTeardown := test.InitCmdStubber()
+	defer cmdTeardown()
+
+	eq(t, len(cs.Calls), 0)
+
+	output, err := RunCommand("pr merge 1 --merge -R stinky/boi")
+	if err != nil {
+		t.Fatalf("error running command `pr merge`: %v", err)
+	}
+
+	r := regexp.MustCompile(`Merged pull request #1`)
+
+	if !r.MatchString(output.String()) {
+		t.Fatalf("output did not match regexp /%s/\n> output\n%q\n", r, output.Stderr())
+	}
+}
+
 func TestPrMerge_deleteBranch(t *testing.T) {
 	initWithStubs("blueberries",
 		stubResponse{200, bytes.NewBufferString(`
diff --git a/git/git.go b/git/git.go
@@ -204,8 +204,8 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {
 }
 
 func DeleteLocalBranch(branch string) error {
-	configCmd := GitCommand("branch", "-d", branch)
-	_, err := run.PrepareCmd(configCmd).Output()
+	branchCmd := GitCommand("branch", "-D", branch)
+	err := run.PrepareCmd(branchCmd).Run()
 	return err
 }
 
@@ -223,7 +223,7 @@ func HasLocalBranch(branch string) bool {
 
 func CheckoutBranch(branch string) error {
 	configCmd := GitCommand("checkout", branch)
-	_, err := run.PrepareCmd(configCmd).Output()
+	err := run.PrepareCmd(configCmd).Run()
 	return err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,8 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`func DeleteLocalBranch(branch string) error {`
`207`		`- configCmd := GitCommand("branch", "-d", branch)`
`208`		`- _, err := run.PrepareCmd(configCmd).Output()`
	`207`	`+ branchCmd := GitCommand("branch", "-D", branch)`
	`208`	`+ err := run.PrepareCmd(branchCmd).Run()`
`209`	`209`	`return err`
`210`	`210`	`}`
`211`	`211`
`@@ -223,7 +223,7 @@ func HasLocalBranch(branch string) bool {`
`223`	`223`
`224`	`224`	`func CheckoutBranch(branch string) error {`
`225`	`225`	`configCmd := GitCommand("checkout", branch)`
`226`		`- _, err := run.PrepareCmd(configCmd).Output()`
	`226`	`+ err := run.PrepareCmd(configCmd).Run()`
`227`	`227`	`return err`
`228`	`228`	`}`
`229`	`229`