From 4b36b115b857550135674eeec345fcea89ea1dc8 Mon Sep 17 00:00:00 2001 From: Julian Thome Date: Fri, 15 Mar 2024 16:21:48 +0100 Subject: [PATCH 1/2] fix: handle surpressed error messages --- commands/help/help.go | 6 ++---- commands/mr/create/mr_create.go | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/commands/help/help.go b/commands/help/help.go index 541fb0ef9..29ad1ca24 100644 --- a/commands/help/help.go +++ b/commands/help/help.go @@ -37,7 +37,7 @@ import ( // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -func RootUsageFunc(command *cobra.Command) error { +func RootUsageFunc(command *cobra.Command) { command.Printf("Usage: %s", command.UseLine()) subcommands := command.Commands() @@ -49,7 +49,6 @@ func RootUsageFunc(command *cobra.Command) error { } command.Printf(" %s\n", c.Name()) } - return nil } flagUsages := command.LocalFlags().FlagUsages() @@ -57,7 +56,6 @@ func RootUsageFunc(command *cobra.Command) error { command.Println("\n\nFlags:") command.Print(utils.Indent(dedent(flagUsages), " ")) } - return nil } var hasFailed bool @@ -91,7 +89,7 @@ func nestedSuggestFunc(command *cobra.Command, arg string) { } command.Print("\n") - _ = RootUsageFunc(command) + RootUsageFunc(command) } func isRootCmd(command *cobra.Command) bool { diff --git a/commands/mr/create/mr_create.go b/commands/mr/create/mr_create.go index 45b059fce..0c145f05f 100644 --- a/commands/mr/create/mr_create.go +++ b/commands/mr/create/mr_create.go @@ -106,7 +106,10 @@ func NewCmdCreate(f *cmdutils.Factory, runE func(opts *CreateOpts) error) *cobra repoOverride = repoFromEnv } if repoOverride != "" { - _ = headRepoOverride(opts, repoOverride) + err := headRepoOverride(opts, repoOverride) + if err != nil { + fmt.Fprintf(opts.IO.StdErr, "Could not create recovery file: %v", err) + } } }, RunE: func(cmd *cobra.Command, args []string) error { -- GitLab From 5b2efd0f460c99b5af28ac44a0a6177ccab9d0e0 Mon Sep 17 00:00:00 2001 From: Julian Thome Date: Fri, 15 Mar 2024 16:27:54 +0100 Subject: [PATCH 2/2] fix function signature --- commands/help/help.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/commands/help/help.go b/commands/help/help.go index 29ad1ca24..8a17105d9 100644 --- a/commands/help/help.go +++ b/commands/help/help.go @@ -37,7 +37,7 @@ import ( // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -func RootUsageFunc(command *cobra.Command) { +func RootUsageFunc(command *cobra.Command) error { command.Printf("Usage: %s", command.UseLine()) subcommands := command.Commands() @@ -49,6 +49,7 @@ func RootUsageFunc(command *cobra.Command) { } command.Printf(" %s\n", c.Name()) } + return nil } flagUsages := command.LocalFlags().FlagUsages() @@ -56,6 +57,7 @@ func RootUsageFunc(command *cobra.Command) { command.Println("\n\nFlags:") command.Print(utils.Indent(dedent(flagUsages), " ")) } + return nil } var hasFailed bool @@ -89,7 +91,8 @@ func nestedSuggestFunc(command *cobra.Command, arg string) { } command.Print("\n") - RootUsageFunc(command) + // this funtion does not return any errors + _ = RootUsageFunc(command) } func isRootCmd(command *cobra.Command) bool { -- GitLab