From f6251f5f3d47843a4245aeffed9baf7c7af0bed1 Mon Sep 17 00:00:00 2001
From: Sascha Holzleiter <sascha@root-login.org>
Date: Thu, 3 Dec 2015 14:58:31 +0100
Subject: [PATCH] always show help if requested, even if SilenceErrors is
 enabled

---
 command.go | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/command.go b/command.go
index f5fa34e2..7fac6607 100644
--- a/command.go
+++ b/command.go
@@ -661,13 +661,16 @@ func (c *Command) ExecuteC() (cmd *Command, err error) {
 	}
 	err = cmd.execute(flags)
 	if err != nil {
+		// Always show help if requested, even if SilenceErrors is in
+		// effect
+		if err == flag.ErrHelp {
+			cmd.HelpFunc()(cmd, args)
+			return cmd, nil
+		}
+
 		// If root command has SilentErrors flagged,
 		// all subcommands should respect it
 		if !cmd.SilenceErrors && !c.SilenceErrors {
-			if err == flag.ErrHelp {
-				cmd.HelpFunc()(cmd, args)
-				return cmd, nil
-			}
 			c.Println("Error:", err.Error())
 		}