diff --git a/cmd/main.go b/cmd/main.go index 65cde47884..005dd763cf 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -80,7 +80,6 @@ func appGlobalFlags() []cli.Flag { func prepareSubcommandWithConfig(command *cli.Command, globalFlags func() []cli.Flag) { command.Flags = append(globalFlags(), command.Flags...) command.Action = prepareWorkPathAndCustomConf(command.Action) - command.HideHelp = true if command.Name != "help" { command.Commands = append(command.Commands, cmdHelp()) } @@ -199,7 +198,6 @@ func innerNewMainApp(version, versionExtra string, subCmdsStandaloneArgs, subCmd } app.Flags = append(app.Flags, cli.VersionFlag) app.Flags = append(app.Flags, globalFlags()...) - app.HideHelp = true // use our own help action to show helps (with more information like default config) app.Before = PrepareConsoleLoggerLevel(log.INFO) for i := range subCmdWithConfig { prepareSubcommandWithConfig(subCmdWithConfig[i], globalFlags) diff --git a/go.mod b/go.mod index 35774fcec1..7920d499a5 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( github.com/stretchr/testify v1.11.1 github.com/syndtr/goleveldb v1.0.0 github.com/ulikunitz/xz v0.5.15 - github.com/urfave/cli/v3 v3.6.2 + github.com/urfave/cli/v3 v3.7.0 github.com/valyala/fastjson v1.6.10 github.com/yohcop/openid-go v1.0.1 github.com/yuin/goldmark v1.7.16 @@ -275,5 +275,3 @@ replace github.com/gliderlabs/ssh => code.forgejo.org/forgejo/ssh v0.0.0-2024121 replace git.sr.ht/~mariusor/go-xsd-duration => code.forgejo.org/forgejo/go-xsd-duration v0.0.0-20220703122237-02e73435a078 replace xorm.io/xorm v1.3.9 => code.forgejo.org/xorm/xorm v1.3.9-forgejo.8 - -replace github.com/urfave/cli/v3 => github.com/urfave/cli/v3 v3.5.0 diff --git a/go.sum b/go.sum index 7494efffa6..1c6ac206f4 100644 --- a/go.sum +++ b/go.sum @@ -660,8 +660,8 @@ github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77ro github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY= github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= -github.com/urfave/cli/v3 v3.5.0 h1:qCuFMmdayTF3zmjG8TSsoBzrDqszNrklYg2x3g4MSgw= -github.com/urfave/cli/v3 v3.5.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= +github.com/urfave/cli/v3 v3.7.0 h1:AGSnbUyjtLiM+WJUb4dzXKldl/gL+F8OwmRDtVr6g2U= +github.com/urfave/cli/v3 v3.7.0/go.mod h1:ysVLtOEmg2tOy6PknnYVhDoouyC/6N42TMeoMzskhso= github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY= github.com/valyala/fastjson v1.6.10 h1:/yjJg8jaVQdYR3arGxPE2X5z89xrlhS0eGXdv+ADTh4= github.com/valyala/fastjson v1.6.10/go.mod h1:e6FubmQouUNP73jtMLmcbxS6ydWIpOfhz34TSfO3JaE=