From ff03bffb15b4b7c64a4a4822ce073236279612cb Mon Sep 17 00:00:00 2001 From: Jeffrey Faer Date: Mon, 8 Sep 2025 21:04:09 -0600 Subject: [PATCH 1/3] Revert "fix: Stop printing "pflag: help requested" when asked for help. (#95)" This reverts commit 80b6daffea8e39dbd988938ad335c77df92a9ac9. --- main.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/main.go b/main.go index 3aaac0b..e7acbe2 100644 --- a/main.go +++ b/main.go @@ -16,7 +16,6 @@ package main import ( - "errors" "fmt" "os" "path" @@ -31,8 +30,6 @@ import ( ) func main() { - flag.CommandLine.Init(os.Args[0], flag.ContinueOnError) - c := &cmd.Config{} c.FromFlags(nil) logLevel := flag.CountP("verbose", "v", "Log more verbosely") @@ -51,12 +48,7 @@ func main() { flag.PrintDefaults() } - if err := flag.CommandLine.Parse(os.Args[1:]); err != nil { - if !errors.Is(err, flag.ErrHelp) { - fmt.Fprintln(os.Stderr, err) - } - os.Exit(2) - } + flag.Parse() if *version { fmt.Fprintln(os.Stdout, readVersion()) From 7ce8e0081b72ac88ba41d299eef5271aa8707992 Mon Sep 17 00:00:00 2001 From: Jeffrey Faer Date: Mon, 8 Sep 2025 21:04:33 -0600 Subject: [PATCH 2/3] bump pflag to v1.0.10 which includes the fix to stop printing ErrHelp. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 61eadce..fdaca38 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/google/go-cmp v0.5.8 github.com/mattn/go-isatty v0.0.20 github.com/rs/zerolog v1.31.0 - github.com/spf13/pflag v1.0.5 + github.com/spf13/pflag v1.0.10 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 4b20559..7e85458 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,8 @@ github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= From b3e12740cde7068b1ce9deced63a0afbeed30fbe Mon Sep 17 00:00:00 2001 From: Jeffrey Faer Date: Mon, 8 Sep 2025 21:07:21 -0600 Subject: [PATCH 3/3] go mod tidy --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 7e85458..bd75113 100644 --- a/go.sum +++ b/go.sum @@ -20,8 +20,6 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=