Registering the Checkout command and fixed a typo.

The Checkout command line command was added to JGit but it wasn't
registered in the list of available commands.
Additionally, the 'force' option was named '---force' (triple '-').

Change-Id: I259773932fa9aec3bb29e215740e67c834566f6f
Signed-off-by: Sasa Zivkov <sasa.zivkov@sap.com>

diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
index f5d45f0d78618349129bec46df5dae0eed7ebe9c..c929578de266f37830f32889ed3d8d8b38ed32d3 100644 (file)
--- a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
+++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin
@@ -1,6 +1,7 @@
 org.eclipse.jgit.pgm.Add
 org.eclipse.jgit.pgm.AmazonS3Client
 org.eclipse.jgit.pgm.Branch
+org.eclipse.jgit.pgm.Checkout
 org.eclipse.jgit.pgm.Clone
 org.eclipse.jgit.pgm.Commit
 org.eclipse.jgit.pgm.Daemon

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
index d83427c7c00eb51ced4ba72ed12a8b1e7b1b3135..1b014f04ae748200803803c1ae9536ff0dd4e06b 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java
@@ -54,7 +54,7 @@ class Checkout extends TextBuiltin {
        @Option(name = "-b", usage = "usage_createBranchAndCheckout")
        private boolean createBranch = false;
 
-       @Option(name = "---force", aliases = { "-f" }, usage = "usage_forceCheckout")
+       @Option(name = "--force", aliases = { "-f" }, usage = "usage_forceCheckout")
        private boolean force = false;
 
        @Argument(required = true, metaVar = "metaVar_name", usage = "usage_checkout")