Merge branch 'master' into version-flag

mislav · web-flow · commit 29399241241b · 2019-10-31T23:13:07.000+01:00
diff --git a/command/root.go b/command/root.go
@@ -22,13 +22,25 @@ func init() {
 	RootCmd.PersistentFlags().StringP("current-branch", "B", "", "current git branch")
 	// TODO:
 	// RootCmd.PersistentFlags().BoolP("verbose", "V", false, "enable verbose output")
+
+	RootCmd.SetFlagErrorFunc(func(cmd *cobra.Command, err error) error {
+		return FlagError{err}
+	})
+}
+
+// FlagError is the kind of error raised in flag processing
+type FlagError struct {
+	error
 }
 
 // RootCmd is the entry point of command-line execution
 var RootCmd = &cobra.Command{
 	Use:   "gh",
 	Short: "GitHub CLI",
 	Long:  `Do things with GitHub from your terminal`,
+
+	SilenceErrors: true,
+	SilenceUsage:  true,
 }
 
 // overriden in tests
diff --git a/main.go b/main.go
@@ -3,13 +3,18 @@ package main
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/github/gh-cli/command"
 )
 
 func main() {
-	if err := command.RootCmd.Execute(); err != nil {
-		fmt.Println(err)
+	if cmd, err := command.RootCmd.ExecuteC(); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		_, isFlagError := err.(command.FlagError)
+		if isFlagError || strings.HasPrefix(err.Error(), "unknown command ") {
+			fmt.Fprintln(os.Stderr, cmd.UsageString())
+		}
 		os.Exit(1)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,18 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"os"`
	`6`	`+ "strings"`
`6`	`7`
`7`	`8`	`"github.com/github/gh-cli/command"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func main() {`
`11`		`- if err := command.RootCmd.Execute(); err != nil {`
`12`		`- fmt.Println(err)`
	`12`	`+ if cmd, err := command.RootCmd.ExecuteC(); err != nil {`
	`13`	`+ fmt.Fprintln(os.Stderr, err)`
	`14`	`+ _, isFlagError := err.(command.FlagError)`
	`15`	`+ if isFlagError \|\| strings.HasPrefix(err.Error(), "unknown command ") {`
	`16`	`+ fmt.Fprintln(os.Stderr, cmd.UsageString())`
	`17`	`+ }`
`13`	`18`	`os.Exit(1)`
`14`	`19`	`}`
`15`	`20`	`}`