diff --git a/cmd/root.go b/cmd/root.go index a5ee72fc..f8aed72a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -26,8 +26,11 @@ var RootCmd = &cobra.Command{ ZshCompletionFunction: zshCompletionFunction, Run: func(cmd *cobra.Command, args []string) { if ok, err := cmd.Flags().GetBool("version"); err == nil && ok { + fmt.Println("here") versionCmd.Run(cmd, args) return + } else { + fmt.Println("here 2") } helpCmd.Run(cmd, args) }, @@ -287,13 +290,13 @@ func Execute() { // allow flags to the root cmd to be passed through. Technically we'll drop any exit code info which isn't ideal. // TODO: remove for 1.0 when we stop wrapping git if cmd.Use == RootCmd.Use && len(os.Args) > 1 { - var hFlaged bool + var knownFlag bool for _, v := range os.Args { - if v == "--help" { - hFlaged = true + if v == "--help" || v == "--version" { + knownFlag = true } } - if !hFlaged { + if !knownFlag { git.New(os.Args[1:]...).Run() return }