From c2a3ce79654214ba1bd29137e42786dd98bc3e2f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 14 Dec 2019 23:14:50 +0100 Subject: [PATCH] pgm: add option if reflogs should be written when converting to reftable Change-Id: Ie1c38121005965e63015d9a2af26a1caa88d73fa Signed-off-by: Matthias Sohn --- .../org/eclipse/jgit/pgm/internal/CLIText.properties | 1 + .../src/org/eclipse/jgit/pgm/ConvertRefStorage.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index bce2892c2..f3e1fe31b 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -331,6 +331,7 @@ usage_configureTheServiceInDaemonServicename=configure the service in daemon.ser usage_convertRefStorage=Convert ref storage to reftable usage_convertRefStorageBackup=Create backup of old ref storage format usage_convertRefStorageFormat=Format to convert to (reftable or refdir) +usage_convertRefStorageRefLogs=Write reflogs to reftable usage_createBranchAndCheckout=create branch and check out usage_deleteBranchEvenIfNotMerged=delete branch (even if not merged) usage_deleteFullyMergedBranch=delete fully merged branch diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ConvertRefStorage.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ConvertRefStorage.java index 3f3cd12a0..d5a23be66 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ConvertRefStorage.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/ConvertRefStorage.java @@ -57,9 +57,13 @@ class ConvertRefStorage extends TextBuiltin { "-b" }, usage = "usage_convertRefStorageBackup") private boolean backup = true; + @Option(name = "--reflogs", handler = ExplicitBooleanOptionHandler.class, aliases = { + "-r" }, usage = "usage_convertRefStorageRefLogs") + private boolean writeLogs = true; + /** {@inheritDoc} */ @Override protected void run() throws Exception { - ((FileRepository) db).convertRefStorage(format, true, backup); + ((FileRepository) db).convertRefStorage(format, writeLogs, backup); } }