Skip to content

Commit 40abc49

Browse files
authored
Merge pull request #443 from spf13/silence-errhelp
fix: Don't print ErrHelp in ParseAll
2 parents 094909d + 1bf832c commit 40abc49

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

flag.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@ func (f *FlagSet) Parse(arguments []string) error {
11731173
case ContinueOnError:
11741174
return err
11751175
case ExitOnError:
1176-
if err == ErrHelp {
1176+
if errors.Is(err, ErrHelp) {
11771177
os.Exit(0)
11781178
}
11791179
fmt.Fprintln(f.Output(), err)
@@ -1202,6 +1202,9 @@ func (f *FlagSet) ParseAll(arguments []string, fn func(flag *Flag, value string)
12021202
case ContinueOnError:
12031203
return err
12041204
case ExitOnError:
1205+
if errors.Is(err, ErrHelp) {
1206+
os.Exit(0)
1207+
}
12051208
fmt.Fprintln(f.Output(), err)
12061209
os.Exit(2)
12071210
case PanicOnError:

0 commit comments

Comments
 (0)