From fc8a433ceeaaf7a4ce10cdce10235ab987de6b08 Mon Sep 17 00:00:00 2001
From: Shikachuu <zcmate@gmail.com>
Date: Sun, 3 Oct 2021 11:11:36 +0200
Subject: [PATCH] Remove the hidden flag from version, added --version and -v
 flags to root command.

Signed-off-by: Shikachuu <zcmate@gmail.com>
---
 cmd/compose/compose.go | 6 ++++++
 cmd/compose/version.go | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go
index f76ae7aca..aaeefeb60 100644
--- a/cmd/compose/compose.go
+++ b/cmd/compose/compose.go
@@ -222,6 +222,7 @@ func RootCommand(backend api.Service) *cobra.Command {
 		ansi    string
 		noAnsi  bool
 		verbose bool
+		version bool
 	)
 	command := &cobra.Command{
 		Short:            "Docker Compose",
@@ -232,6 +233,9 @@ func RootCommand(backend api.Service) *cobra.Command {
 			if len(args) == 0 {
 				return cmd.Help()
 			}
+			if version {
+				return versionCommand().Execute()
+			}
 			_ = cmd.Help()
 			return dockercli.StatusError{
 				StatusCode: compose.CommandSyntaxFailure.ExitCode,
@@ -304,6 +308,8 @@ func RootCommand(backend api.Service) *cobra.Command {
 	command.Flags().SetInterspersed(false)
 	opts.addProjectFlags(command.Flags())
 	command.Flags().StringVar(&ansi, "ansi", "auto", `Control when to print ANSI control characters ("never"|"always"|"auto")`)
+	command.Flags().BoolVarP(&version, "version", "v", false, "Show the Docker Compose version information")
+	command.Flags().MarkHidden("version") //nolint:errcheck
 	command.Flags().BoolVar(&noAnsi, "no-ansi", false, `Do not print ANSI control characters (DEPRECATED)`)
 	command.Flags().MarkHidden("no-ansi") //nolint:errcheck
 	command.Flags().BoolVar(&verbose, "verbose", false, "Show more output")
diff --git a/cmd/compose/version.go b/cmd/compose/version.go
index 630a9a98f..a29c52cd7 100644
--- a/cmd/compose/version.go
+++ b/cmd/compose/version.go
@@ -34,10 +34,9 @@ type versionOptions struct {
 func versionCommand() *cobra.Command {
 	opts := versionOptions{}
 	cmd := &cobra.Command{
-		Use:    "version",
-		Short:  "Show the Docker Compose version information",
-		Args:   cobra.MaximumNArgs(0),
-		Hidden: true,
+		Use:   "version",
+		Short: "Show the Docker Compose version information",
+		Args:  cobra.MaximumNArgs(0),
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			runVersion(opts)
 			return nil