X Tutup
Skip to content

Commit f0cd830

Browse files
probablycoreyvilmibm
probablycorey
and
vilmibm
committed
Fix merge flag
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
1 parent 2328dff commit f0cd830

File tree

4 files changed

+38
-9
lines changed

4 files changed

+38
-9
lines changed

‎command/pr.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ func prMerge(cmd *cobra.Command, args []string) error {
479479
return nil
480480
}
481481

482-
isInteractive := !cmd.Flags().Changed("rebase") && !cmd.Flags().Changed("squash") && !cmd.Flags().Changed("merged")
482+
isInteractive := !cmd.Flags().Changed("rebase") && !cmd.Flags().Changed("squash") && !cmd.Flags().Changed("merge")
483483
if isInteractive {
484484
mergeMethod, deleteBranch, err = prInteractiveMerge()
485485
if err != nil {
@@ -592,7 +592,7 @@ func prDeleteCurrentBranch(repo *api.Repository) (string, error) {
592592
return "", err
593593
}
594594

595-
err = git.DeleteBranch(branch)
595+
err = git.DeleteLocalBranch(branch)
596596
return branch, err
597597
}
598598

‎command/pr_test.go‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ func TestPrMerge(t *testing.T) {
996996
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
997997
)
998998

999-
output, err := RunCommand("pr merge 1")
999+
output, err := RunCommand("pr merge 1 --merge")
10001000
if err != nil {
10011001
t.Fatalf("error running command `pr merge`: %v", err)
10021002
}
@@ -1013,6 +1013,10 @@ func TestPrMerge_noPrNumberGiven(t *testing.T) {
10131013
defer cmdTeardown()
10141014

10151015
cs.Stub("branch.blueberries.remote origin\nbranch.blueberries.merge refs/heads/blueberries") // git config --get-regexp ^branch\.master\.(remote|merge)
1016+
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
1017+
cs.Stub("") // git symbolic-ref --quiet --short HEAD
1018+
cs.Stub("") // git checkout master
1019+
cs.Stub("") // git branch -d
10161020

10171021
jsonFile, _ := os.Open("../test/fixtures/prViewPreviewWithMetadataByBranch.json")
10181022
defer jsonFile.Close()
@@ -1022,7 +1026,7 @@ func TestPrMerge_noPrNumberGiven(t *testing.T) {
10221026
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
10231027
)
10241028

1025-
output, err := RunCommand("pr merge")
1029+
output, err := RunCommand("pr merge --merge")
10261030
if err != nil {
10271031
t.Fatalf("error running command `pr merge`: %v", err)
10281032
}
@@ -1042,6 +1046,14 @@ func TestPrMerge_rebase(t *testing.T) {
10421046
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
10431047
)
10441048

1049+
cs, cmdTeardown := test.InitCmdStubber()
1050+
defer cmdTeardown()
1051+
1052+
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
1053+
cs.Stub("") // git symbolic-ref --quiet --short HEAD
1054+
cs.Stub("") // git checkout master
1055+
cs.Stub("") // git branch -d
1056+
10451057
output, err := RunCommand("pr merge 2 --rebase")
10461058
if err != nil {
10471059
t.Fatalf("error running command `pr merge`: %v", err)
@@ -1062,6 +1074,14 @@ func TestPrMerge_squash(t *testing.T) {
10621074
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
10631075
)
10641076

1077+
cs, cmdTeardown := test.InitCmdStubber()
1078+
defer cmdTeardown()
1079+
1080+
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
1081+
cs.Stub("") // git symbolic-ref --quiet --short HEAD
1082+
cs.Stub("") // git checkout master
1083+
cs.Stub("") // git branch -d
1084+
10651085
output, err := RunCommand("pr merge 3 --squash")
10661086
if err != nil {
10671087
t.Fatalf("error running command `pr merge`: %v", err)
@@ -1082,6 +1102,14 @@ func TestPrMerge_alreadyMerged(t *testing.T) {
10821102
stubResponse{200, bytes.NewBufferString(`{"id": "THE-ID"}`)},
10831103
)
10841104

1105+
cs, cmdTeardown := test.InitCmdStubber()
1106+
defer cmdTeardown()
1107+
1108+
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
1109+
cs.Stub("") // git symbolic-ref --quiet --short HEAD
1110+
cs.Stub("") // git checkout master
1111+
cs.Stub("") // git branch -d
1112+
10851113
output, err := RunCommand("pr merge 4")
10861114
if err == nil {
10871115
t.Fatalf("expected an error running command `pr merge`: %v", err)
@@ -1105,10 +1133,10 @@ func TestPRMerge_interactive(t *testing.T) {
11051133
cs, cmdTeardown := test.InitCmdStubber()
11061134
defer cmdTeardown()
11071135

1108-
cs.Stub("")
1109-
cs.Stub("")
1110-
cs.Stub("")
1111-
cs.Stub("")
1136+
cs.Stub("") // git config --get-regexp ^branch\.blueberries\.(remote|merge)$
1137+
cs.Stub("") // git symbolic-ref --quiet --short HEAD
1138+
cs.Stub("") // git checkout master
1139+
cs.Stub("") // git branch -d
11121140

11131141
as, surveyTeardown := initAskStubber()
11141142
defer surveyTeardown()

‎git/git.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ func ReadBranchConfig(branch string) (cfg BranchConfig) {
203203
return
204204
}
205205

206-
func DeleteBranch(branch string) error {
206+
func DeleteLocalBranch(branch string) error {
207207
configCmd := GitCommand("branch", "-d", branch)
208208
_, err := run.PrepareCmd(configCmd).Output()
209209
return err

‎test/helpers.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ func createStubbedPrepareCmd(cs *CmdStubber) func(*exec.Cmd) run.Runnable {
6868
if call >= len(cs.Stubs) {
6969
panic(fmt.Sprintf("more execs than stubs. most recent call: %v", cmd))
7070
}
71+
// fmt.Printf("Called stub for `%v`\n", cmd) // Helpful for debugging
7172
return cs.Stubs[call]
7273
}
7374
}

0 commit comments

Comments
 (0)
X Tutup