Merge commit 'e194a18' into v3-porting

This commit is contained in:
Dan Buch 2022-11-07 08:35:26 -05:00
commit 3d52a48204
Signed by: meatballhat
GPG Key ID: A12F782281063434

View File

@ -246,7 +246,7 @@ func ShowCommandHelp(ctx *Context, command string) error {
} }
for _, c := range commands { for _, c := range commands {
if c.HasName(command) { if c.HasName(command) {
if !ctx.App.HideHelpCommand && !c.HasName(helpName) && len(c.Subcommands) != 0 { if !ctx.App.HideHelpCommand && !c.HasName(helpName) && len(c.Subcommands) != 0 && c.Command(helpName) == nil {
c.Subcommands = append(c.Subcommands, helpCommandDontUse) c.Subcommands = append(c.Subcommands, helpCommandDontUse)
} }
if !ctx.App.HideHelp && HelpFlag != nil { if !ctx.App.HideHelp && HelpFlag != nil {