From 13fffa75139fa49cd037868c2fd41bd0c8158f75 Mon Sep 17 00:00:00 2001 From: Sasa Zivkov Date: Thu, 24 Mar 2011 11:13:16 +0100 Subject: [PATCH] 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 --- .../META-INF/services/org.eclipse.jgit.pgm.TextBuiltin | 1 + org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 f5d45f0d7..c929578de 100644 --- 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 d83427c7c..1b014f04a 100644 --- 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")