STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add flag for deleting branch

Browse source 
Co-Authored-By: Nate Smith <vilmibm@neongrid.space>
This commit is contained in:
Corey Johnson 2020-05-12 08:58:38 -07:00
parent 9187efdc92
commit fabbfe1da6
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
command/pr.go
View file

@ -28,6 +28,7 @@ func init() {
prCmd.AddCommand(prCloseCmd)
prCmd.AddCommand(prReopenCmd)
prCmd.AddCommand(prMergeCmd)
prMergeCmd.Flags().BoolP("delete", "d", true, "Delete the local branch after merge")
prMergeCmd.Flags().BoolP("merge", "m", true, "Merge the commits with the base branch")
prMergeCmd.Flags().BoolP("rebase", "r", false, "Rebase the commits onto the base branch")
prMergeCmd.Flags().BoolP("squash", "s", false, "Squash the commits into one commit and merge it into the base branch")
@ -473,7 +474,10 @@ func prMerge(cmd *cobra.Command, args []string) error {
}
mergeMethod := api.PullRequestMergeMethodMerge
deleteBranch := true
deleteBranch, err := cmd.Flags().GetBool("delete")
if err != nil {
return nil
}
isInteractive := !cmd.Flags().Changed("rebase") && !cmd.Flags().Changed("squash") && !cmd.Flags().Changed("merged")
if isInteractive {