Merge changes Ib88b6e58,Idffb8c7a into stable-3.4
* changes:
sshd.ConvertRefStorage: use ExplicitBooleanOptionHandler
sshd.ConvertRefStorage: don't print default values
diff --git a/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java b/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java
index 21d90ed..98626de 100644
--- a/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java
+++ b/java/com/google/gerrit/sshd/commands/ConvertRefStorage.java
@@ -31,6 +31,7 @@
import org.eclipse.jgit.internal.storage.file.FileRepository;
import org.eclipse.jgit.lib.Repository;
import org.kohsuke.args4j.Option;
+import org.kohsuke.args4j.spi.ExplicitBooleanOptionHandler;
@RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER)
@CommandMetaData(
@@ -45,21 +46,21 @@
refdir,
}
- @Option(
- name = "--format",
- usage = "storage format to convert to (reftable or refdir) (default: reftable)")
+ @Option(name = "--format", usage = "storage format to convert to (reftable or refdir)")
private StorageFormatOption storageFormat = StorageFormatOption.reftable;
@Option(
name = "--backup",
aliases = {"-b"},
- usage = "create backup of old ref storage format (default: true)")
+ usage = "create backup of old ref storage format",
+ handler = ExplicitBooleanOptionHandler.class)
private boolean backup = true;
@Option(
name = "--reflogs",
aliases = {"-r"},
- usage = "write reflogs to reftable (default: true)")
+ usage = "write reflogs to reftable",
+ handler = ExplicitBooleanOptionHandler.class)
private boolean writeLogs = true;
@Option(
