From 92aeee7d6cb3cdc6fb925336dac396b4eaa995f9 Mon Sep 17 00:00:00 2001
From: Gary Miller <gm@wx.io>
Date: Tue, 16 Jan 2018 13:16:07 +1100
Subject: [PATCH 1/2] test if short flag is a bool setting inFlag

---
 command.go | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/command.go b/command.go
index 5fefb58d..3c229890 100644
--- a/command.go
+++ b/command.go
@@ -444,16 +444,23 @@ func hasNoOptDefVal(name string, fs *flag.FlagSet) bool {
 	return flag.NoOptDefVal != ""
 }
 
-func shortHasNoOptDefVal(name string, fs *flag.FlagSet) bool {
-	if len(name) == 0 {
-		return false
+func shortWithSpace(arg string, c *Command) bool {
+	if strings.HasPrefix(arg, "-") {
+		if !strings.Contains(arg, "=") {
+			if len(arg) == 2 {
+				flag := c.Flags().ShorthandLookup(arg[1:])
+				if flag == nil {
+					return false
+				}
+				if flag.Value.Type() == "bool" {
+					return false
+				}
+				//shortHasNoOptDefVal
+				return flag.NoOptDefVal != ""
+			}
+		}
 	}
-
-	flag := fs.ShorthandLookup(name[:1])
-	if flag == nil {
-		return false
-	}
-	return flag.NoOptDefVal != ""
+	return false
 }
 
 func stripFlags(args []string, c *Command) []string {
@@ -474,7 +481,7 @@ Loop:
 			// If '--flag arg' then
 			// delete arg from args.
 			fallthrough // (do the same as below)
-		case strings.HasPrefix(s, "-") && !strings.Contains(s, "=") && len(s) == 2 && !shortHasNoOptDefVal(s[1:], flags):
+		case shortWithSpace(s, c):
 			// If '-f arg' then
 			// delete 'arg' from args or break the loop if len(args) <= 1.
 			if len(args) <= 1 {
@@ -585,7 +592,7 @@ func (c *Command) Traverse(args []string) (*Command, []string, error) {
 			flags = append(flags, arg)
 			continue
 		// A short flag with a space separated value
-		case strings.HasPrefix(arg, "-") && !strings.Contains(arg, "=") && len(arg) == 2 && !shortHasNoOptDefVal(arg[1:], c.Flags()):
+		case shortWithSpace(arg, c):
 			inFlag = true
 			flags = append(flags, arg)
 			continue

From 1972d4ec3b9efff880c81ed4df696e85704a5b07 Mon Sep 17 00:00:00 2001
From: Gary Miller <gm@wx.io>
Date: Tue, 16 Jan 2018 16:30:46 +1100
Subject: [PATCH 2/2] merge flags & check bool regular flag

---
 command.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/command.go b/command.go
index 3c229890..f150b0ec 100644
--- a/command.go
+++ b/command.go
@@ -436,10 +436,13 @@ func (c *Command) VersionTemplate() string {
 `
 }
 
-func hasNoOptDefVal(name string, fs *flag.FlagSet) bool {
-	flag := fs.Lookup(name)
+func hasDefault(name string, c *Command) bool {
+	flag := c.Flags().Lookup(name)
 	if flag == nil {
-		return false
+		return true
+	}
+	if flag.Value.Type() == "bool" {
+		return true
 	}
 	return flag.NoOptDefVal != ""
 }
@@ -468,16 +471,13 @@ func stripFlags(args []string, c *Command) []string {
 		return args
 	}
 	c.mergePersistentFlags()
-
 	commands := []string{}
-	flags := c.Flags()
-
 Loop:
 	for len(args) > 0 {
 		s := args[0]
 		args = args[1:]
 		switch {
-		case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasNoOptDefVal(s[2:], flags):
+		case strings.HasPrefix(s, "--") && !strings.Contains(s, "=") && !hasDefault(s[2:], c):
 			// If '--flag arg' then
 			// delete arg from args.
 			fallthrough // (do the same as below)
@@ -580,6 +580,7 @@ func (c *Command) findNext(next string) *Command {
 // Traverse the command tree to find the command, and parse args for
 // each parent.
 func (c *Command) Traverse(args []string) (*Command, []string, error) {
+	c.mergePersistentFlags()
 	flags := []string{}
 	inFlag := false
 
@@ -588,7 +589,7 @@ func (c *Command) Traverse(args []string) (*Command, []string, error) {
 		// A long flag with a space separated value
 		case strings.HasPrefix(arg, "--") && !strings.Contains(arg, "="):
 			// TODO: this isn't quite right, we should really check ahead for 'true' or 'false'
-			inFlag = !hasNoOptDefVal(arg[2:], c.Flags())
+			inFlag = !hasDefault(arg[2:], c)
 			flags = append(flags, arg)
 			continue
 		// A short flag with a space separated value