summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorSasa Zivkov2011-03-24 06:13:16 (EDT)
committer Sasa Zivkov2011-03-24 06:22:17 (EDT)
commit13fffa75139fa49cd037868c2fd41bd0c8158f75 (patch)
tree641048f1525b6216b3070fbd6363d85b558f868d
parent55b7bd247ef86c6650c9acc364f426cec38723b5 (diff)
downloadjgit-13fffa75139fa49cd037868c2fd41bd0c8158f75.zip
jgit-13fffa75139fa49cd037868c2fd41bd0c8158f75.tar.gz
jgit-13fffa75139fa49cd037868c2fd41bd0c8158f75.tar.bz2
Registering the Checkout command and fixed a typo.refs/changes/04/2904/2
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>
-rw-r--r--org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin1
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java2
2 files changed, 2 insertions, 1 deletions
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 f5d45f0..c929578 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 d83427c..1b014f0 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")