Merge pull request #5227 from epage/flat

fix(help): Use right about when flattening
clap-rs · Nov 27, 2023 · 5c8f8d5 · 5c8f8d5
2 parents 5c81df6 + 22130e3
commit 5c8f8d5
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 34 deletions.
diff --git a/clap_builder/src/output/help_template.rs b/clap_builder/src/output/help_template.rs
@@ -909,9 +909,9 @@ impl<'cmd, 'writer> HelpTemplate<'cmd, 'writer> {
             *first = false;
 
             let heading = subcommand.get_usage_name_fallback();
-            let about = cmd
+            let about = subcommand
                 .get_about()
-                .or_else(|| cmd.get_long_about())
+                .or_else(|| subcommand.get_long_about())
                 .unwrap_or_default();
 
             let _ = write!(

diff --git a/examples/git-derive.md b/examples/git-derive.md
@@ -95,6 +95,7 @@ git-derive[EXE] stash apply:
   [STASH]  
 
 git-derive[EXE] stash help:
+Print this message or the help of the given subcommand(s)
   [COMMAND]...  Print help for the subcommand(s)
 
 $ git-derive stash push -h

diff --git a/examples/git.md b/examples/git.md
@@ -93,6 +93,7 @@ git[EXE] stash apply:
   [STASH]  
 
 git[EXE] stash help:
+Print this message or the help of the given subcommand(s)
   [COMMAND]...  Print help for the subcommand(s)
 
 $ git stash push -h