Make markdown:generate annotation a markdown generation override for hidden commands

internal/docs/markdown.go

@@ -82,10 +82,9 @@ func GenMarkdownTree(cmd *cobra.Command, dir string) error {
 // with custom filePrepender and linkHandler.
 func GenMarkdownTreeCustom(cmd *cobra.Command, dir string, filePrepender, linkHandler func(string) string) error {
 	for _, c := range cmd.Commands() {
-		if genMarkdown, ok := c.Annotations["markdown:generate"]; ok {
+		_, forceGeneration := c.Annotations["markdown:generate"]
-			if genMarkdown == "false" {
+		if c.Hidden && !forceGeneration {
-				continue
+			continue
-			}
 		}
 
 		if err := GenMarkdownTreeCustom(c, dir, filePrepender, linkHandler); err != nil {

pkg/cmd/repo/credits/credits.go

@@ -61,9 +61,6 @@ func NewCmdCredits(f *cmdutil.Factory, runF func(*CreditsOptions) error) *cobra.
 			return creditsRun(opts)
 		},
 		Hidden: true,
-		Annotations: map[string]string{
-			"markdown:generate": "false",
-		},
 	}
 
 	cmd.Flags().BoolVarP(&opts.Static, "static", "s", false, "Print a static version of the credits")
@@ -107,9 +104,6 @@ func NewCmdRepoCredits(f *cmdutil.Factory, runF func(*CreditsOptions) error) *co
 			return creditsRun(opts)
 		},
 		Hidden: true,
-		Annotations: map[string]string{
-			"markdown:generate": "false",
-		},
 	}
 
 	cmd.Flags().BoolVarP(&opts.Static, "static", "s", false, "Print a static version of the credits")

pkg/cmd/repo/garden/garden.go

@@ -115,9 +115,6 @@ func NewCmdGarden(f *cmdutil.Factory, runF func(*GardenOptions) error) *cobra.Co
 			}
 			return gardenRun(&opts)
 		},
-		Annotations: map[string]string{
-			"markdown:generate": "false",
-		},
 	}
 
 	return cmd

pkg/cmd/root/help_topic.go

@@ -56,6 +56,7 @@ func NewHelpTopic(topic string) *cobra.Command {
 		Args:   cobra.NoArgs,
 		Run:    helpTopicHelpFunc,
 		Annotations: map[string]string{
+			"markdown:generate": "true",
 			"markdown:basename": "gh_help_" + topic,
 		},
 	}

pkg/cmd/version/version.go

@@ -16,9 +16,6 @@ func NewCmdVersion(f *cmdutil.Factory, version, buildDate string) *cobra.Command
 		Run: func(cmd *cobra.Command, args []string) {
 			fmt.Fprint(f.IOStreams.Out, Format(version, buildDate))
 		},
-		Annotations: map[string]string{
-			"markdown:generate": "false",
-		},
 	}
 
 	cmdutil.DisableAuthCheck(cmd)