make combineBranchName and workingBranchSuffix cli args with defaults

Author: GrantBirki

internal/cmd/combine_prs.go

@@ -18,8 +18,7 @@ func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClien
 	BaseSHA string
 }) error {
 	// Define the combined branch name
-	combineBranchName := "combined-prs"
-	workingBranchName := combineBranchName + "-working"
+	workingBranchName := combineBranchName + workingBranchSuffix
 
 	baseBranchSHA, err := getBranchSHA(ctx, restClient, owner, repo, baseBranch)
 	if err != nil {

internal/cmd/root.go

@@ -14,23 +14,25 @@ import (
 )
 
 var (
-	branchPrefix   string
-	branchSuffix   string
-	branchRegex    string
-	selectLabel    string
-	selectLabels   []string
-	addLabels      []string
-	addAssignees   []string
-	requireCI      bool
-	mustBeApproved bool
-	autoclose      bool
-	updateBranch   bool
-	ignoreLabel    string
-	ignoreLabels   []string
-	reposFile      string
-	minimum        int
-	defaultOwner   string
-	baseBranch     string
+	branchPrefix        string
+	branchSuffix        string
+	branchRegex         string
+	selectLabel         string
+	selectLabels        []string
+	addLabels           []string
+	addAssignees        []string
+	requireCI           bool
+	mustBeApproved      bool
+	autoclose           bool
+	updateBranch        bool
+	ignoreLabel         string
+	ignoreLabels        []string
+	reposFile           string
+	minimum             int
+	defaultOwner        string
+	baseBranch          string
+	combineBranchName   string
+	workingBranchSuffix string
 )
 
 // NewRootCmd creates the root command for the gh-combine CLI
@@ -81,9 +83,11 @@ func NewRootCmd() *cobra.Command {
       gh combine octocat/hello-world --add-assignees octocat,hubot        # Assign users to the new PR
     
       # Additional options
-      gh combine octocat/hello-world --autoclose                    # Close source PRs when combined PR is merged
-	  gh combine octocat/hello-world --base-branch main             # Use a different base branch for the combined PR
-      gh combine octocat/hello-world --update-branch                # Update the branch of the combined PR`,
+      gh combine octocat/hello-world --autoclose                         # Close source PRs when combined PR is merged
+	  gh combine octocat/hello-world --base-branch main                  # Use a different base branch for the combined PR
+	  gh combine octocat/hello-world --combine-branch-name combined-prs  # Use a different name for the combined PR branch
+	  gh combine octocat/hello-world --working-branch-suffix -working    # Use a different suffix for the working branch
+      gh combine octocat/hello-world --update-branch                     # Update the branch of the combined PR`,
 		RunE: runCombine,
 	}
 
@@ -110,6 +114,8 @@ func NewRootCmd() *cobra.Command {
 	rootCmd.Flags().BoolVar(&autoclose, "autoclose", false, "Close source PRs when combined PR is merged")
 	rootCmd.Flags().BoolVar(&updateBranch, "update-branch", false, "Update the branch of the combined PR if possible")
 	rootCmd.Flags().StringVar(&baseBranch, "base-branch", "main", "Base branch for the combined PR (default: main)")
+	rootCmd.Flags().StringVar(&combineBranchName, "combine-branch-name", "combined-prs", "Name of the combined PR branch")
+	rootCmd.Flags().StringVar(&workingBranchSuffix, "working-branch-suffix", "-working", "Suffix of the working branch")
 	rootCmd.Flags().StringVar(&reposFile, "file", "", "File containing repository names, one per line")
 	rootCmd.Flags().IntVar(&minimum, "minimum", 2, "Minimum number of PRs to combine")
 	rootCmd.Flags().StringVar(&defaultOwner, "owner", "", "Default owner for repositories (if not specified in repo name or missing from file inputs)")