From 2f746fec005246423e03cee81d5b5a5f87c6da42 Mon Sep 17 00:00:00 2001 From: Daniel Liu Date: Mon, 25 Nov 2024 11:01:15 +0800 Subject: [PATCH] internal/flags: fix flag redefined bug for cli v2 aliases (#30796) --- internal/flags/flags.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 350f274455a36..c3cc3098d6b5e 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -80,7 +80,7 @@ func (f *DirectoryFlag) String() string { return cli.FlagStringer(f) } // and adds variable to flag set for parsing. func (f *DirectoryFlag) Apply(set *flag.FlagSet) error { eachName(f, func(name string) { - set.Var(&f.Value, f.Name, f.Usage) + set.Var(&f.Value, name, f.Usage) }) return nil } @@ -166,7 +166,7 @@ func (f *TextMarshalerFlag) String() string { return cli.FlagStringer(f) } func (f *TextMarshalerFlag) Apply(set *flag.FlagSet) error { eachName(f, func(name string) { - set.Var(textMarshalerVal{f.Value}, f.Name, f.Usage) + set.Var(textMarshalerVal{f.Value}, name, f.Usage) }) return nil } @@ -248,7 +248,7 @@ func (f *BigFlag) String() string { return cli.FlagStringer(f) } func (f *BigFlag) Apply(set *flag.FlagSet) error { eachName(f, func(name string) { f.Value = new(big.Int) - set.Var((*bigValue)(f.Value), f.Name, f.Usage) + set.Var((*bigValue)(f.Value), name, f.Usage) }) return nil