Merge remote-tracking branch 'origin/main' into michaeljs1990-add-flag-category-support

2022-05-22 11:06:38 -04:00
parent a78717f4f9 939ab7f9e7
commit 4bca72cea1
24 changed files with 103 additions and 69 deletions
--- a/flag_string.go
+++ b/flag_string.go
@@ -44,7 +44,7 @@ func (f *StringFlag) GetEnvVars() []string {

 // Apply populates the flag given the flag set and environment
 func (f *StringFlag) Apply(set *flag.FlagSet) error {
-	if val, ok := flagFromEnvOrFile(f.EnvVars, f.FilePath); ok {
+	if val, _, found := flagFromEnvOrFile(f.EnvVars, f.FilePath); found {
 		f.Value = val
 		f.HasBeenSet = true
 	}