1 files changed, 5 insertions, 14 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
index 5d40923cea..833b4d87f5 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
@@ -32,10 +32,7 @@ public abstract class AbstractProgram {
   private boolean running = true;
 
   @Option(name = "--show-stack-trace", usage = "display stack trace on failure")
-  private boolean showStackTrace;
-
-  @Option(name = "--help", usage = "display this help text", aliases = {"-h"})
-  private boolean help;
+  protected boolean showStackTrace;
 
   private String getName() {
     String n = getClass().getName();
@@ -52,21 +49,15 @@ public abstract class AbstractProgram {
     try {
       clp.parseArgument(argv);
     } catch (CmdLineException err) {
-      if (!help) {
+      if (!clp.wasHelpRequestedByOption()) {
         System.err.println("fatal: " + err.getMessage());
         return 1;
       }
     }
 
-    if (help) {
-      final StringWriter msg = new StringWriter();
-      msg.write(getName());
-      clp.printSingleLineUsage(msg, null);
-      msg.write('\n');
-
-      msg.write('\n');
-      clp.printUsage(msg, null);
-      msg.write('\n');
+    if (clp.wasHelpRequestedByOption()) {
+      StringWriter msg = new StringWriter();
+      clp.printDetailedUsage(getName(), msg);
       System.err.println(msg.toString());
       return 1;
     }