Commit b2f8ee4f authored by Andrey Kurilin's avatar Andrey Kurilin

Fix kubectl help command

PR 48d47b10 broke `kubectl help` command due to wrong check `help for help cmd` . Fixed issue #29736
parent 1d8c15ba
...@@ -41,7 +41,7 @@ func NewCmdHelp(f *cmdutil.Factory, out io.Writer) *cobra.Command { ...@@ -41,7 +41,7 @@ func NewCmdHelp(f *cmdutil.Factory, out io.Writer) *cobra.Command {
} }
func RunHelp(cmd *cobra.Command, args []string) { func RunHelp(cmd *cobra.Command, args []string) {
foundCmd, a, err := cmd.Root().Find(args) foundCmd, _, err := cmd.Root().Find(args)
// NOTE(andreykurilin): actually, I did not find any cases when foundCmd can be nil, // NOTE(andreykurilin): actually, I did not find any cases when foundCmd can be nil,
// but let's make this check since it is included in original code of initHelpCmd // but let's make this check since it is included in original code of initHelpCmd
...@@ -69,10 +69,11 @@ func RunHelp(cmd *cobra.Command, args []string) { ...@@ -69,10 +69,11 @@ func RunHelp(cmd *cobra.Command, args []string) {
// if nothing is found, just print usage // if nothing is found, just print usage
cmd.Root().Usage() cmd.Root().Usage()
} }
} else if len(a) == 0 {
// help message for help command :)
cmd.Root().Usage()
} else { } else {
if len(args) == 0 {
// help message for help command :)
foundCmd = cmd
}
helpFunc := foundCmd.HelpFunc() helpFunc := foundCmd.HelpFunc()
helpFunc(foundCmd, args) helpFunc(foundCmd, args)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment