mirror of
https://github.com/spf13/cobra
synced 2024-11-24 14:47:12 +00:00
Display pflag.CommandLine flags as if they were declared on the parent
```go package main import ( "github.com/spf13/cobra" "github.com/spf13/pflag" ) func main() { cmd := &cobra.Command{ Use: "min", Short: "minimal command", Run: func(_ *cobra.Command, _ []string) {}, } pflag.String("oncmdline", "oncmdline", "oncmdline") cmd.Execute() } ``` Is a minimal cobra program. When --help is displayed without this patch you only get: But with the patch --oncmdline is shows under flags.
This commit is contained in:
parent
c55cdf3385
commit
e8bd799c1c
2 changed files with 15 additions and 1 deletions
|
@ -963,3 +963,11 @@ func TestGlobalNormFuncPropagation(t *testing.T) {
|
|||
t.Error("cmdPrint and cmdEchoSub should had the normalization function of rootCmd")
|
||||
}
|
||||
}
|
||||
|
||||
func TestFlagOnPflagCommandLine(t *testing.T) {
|
||||
flagName := "flagOnCommandLine"
|
||||
pflag.CommandLine.String(flagName, "", "about my flag")
|
||||
r := fullSetupTest("--help")
|
||||
|
||||
checkResultContains(t, r, flagName)
|
||||
}
|
||||
|
|
|
@ -158,7 +158,6 @@ func (c *Command) SetHelpTemplate(s string) {
|
|||
func (c *Command) SetGlobalNormalizationFunc(n func(f *flag.FlagSet, name string) flag.NormalizedName) {
|
||||
c.Flags().SetNormalizeFunc(n)
|
||||
c.PersistentFlags().SetNormalizeFunc(n)
|
||||
c.LocalFlags().SetNormalizeFunc(n)
|
||||
c.globNormFunc = n
|
||||
|
||||
for _, command := range c.commands {
|
||||
|
@ -873,6 +872,13 @@ func (c *Command) LocalFlags() *flag.FlagSet {
|
|||
c.lflags.VisitAll(func(f *flag.Flag) {
|
||||
local.AddFlag(f)
|
||||
})
|
||||
if !c.HasParent() {
|
||||
flag.CommandLine.VisitAll(func(f *flag.Flag) {
|
||||
if local.Lookup(f.Name) == nil {
|
||||
local.AddFlag(f)
|
||||
}
|
||||
})
|
||||
}
|
||||
return local
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue