diff --git a/cmd/commands/pr/merge/merge.go b/cmd/commands/pr/merge/merge.go index bb5c5cb..ad4f7f3 100644 --- a/cmd/commands/pr/merge/merge.go +++ b/cmd/commands/pr/merge/merge.go @@ -3,6 +3,7 @@ package merge import ( "fmt" "strconv" + "strings" "github.com/cli/cli/git" "github.com/craftamap/bb/cmd/commands/pr/view" @@ -13,7 +14,7 @@ import ( func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) { mergeCmd := &cobra.Command{ - Use: "merge", + Use: "merge ", Long: "Merge a pull request on Bitbucket.org", Short: "Merge a pull request", Annotations: map[string]string{ @@ -28,7 +29,7 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) { bbrepo := globalOpts.BitbucketRepo if len(args) > 0 { - id, err = strconv.Atoi(args[0]) + id, err = strconv.Atoi(strings.TrimPrefix(args[0], "#")) if err != nil { fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err) return diff --git a/cmd/commands/pr/statuses/statuses.go b/cmd/commands/pr/statuses/statuses.go index 9dd07d8..4bee347 100644 --- a/cmd/commands/pr/statuses/statuses.go +++ b/cmd/commands/pr/statuses/statuses.go @@ -3,6 +3,7 @@ package statuses import ( "fmt" "strconv" + "strings" "github.com/cli/cli/git" "github.com/craftamap/bb/cmd/options" @@ -19,7 +20,7 @@ const ( func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) { statusesCmd := &cobra.Command{ - Use: "statuses", + Use: "statuses ", Short: "Show CI status for a single pull request", Long: "Show CI status for a single pull request", Annotations: map[string]string{ @@ -34,7 +35,7 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) { bbrepo := globalOpts.BitbucketRepo if len(args) > 0 { - id, err = strconv.Atoi(args[0]) + id, err = strconv.Atoi(strings.TrimPrefix(args[0], "#")) if err != nil { fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err) return diff --git a/cmd/commands/pr/view/view.go b/cmd/commands/pr/view/view.go index f6e836a..542a41f 100644 --- a/cmd/commands/pr/view/view.go +++ b/cmd/commands/pr/view/view.go @@ -3,6 +3,7 @@ package view import ( "fmt" "strconv" + "strings" "github.com/charmbracelet/glamour" "github.com/cli/cli/git" @@ -19,7 +20,7 @@ var ( func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) { viewCmd := &cobra.Command{ - Use: "view", + Use: "view ", Short: "View a pull request", Long: "Display the title, body, and other information about a pull request.", Annotations: map[string]string{ @@ -34,7 +35,7 @@ func Add(prCmd *cobra.Command, globalOpts *options.GlobalOptions) { bbrepo := globalOpts.BitbucketRepo if len(args) > 0 { - id, err = strconv.Atoi(args[0]) + id, err = strconv.Atoi(strings.TrimPrefix(args[0], "#")) if err != nil { fmt.Printf("%s%s%s\n", aurora.Red(":: "), aurora.Bold("An error occurred: "), err) return