aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2011-12-18 10:28:44 (EST)
committerTomasz Zarna2011-12-18 10:28:44 (EST)
commit8c60468ff4cae4a13f57ed4a1822cec7cb2ba22a (patch)
tree9bd7e23e5c4ea0a7caa609d0d723f6dc9feece1c
parentdc4c06e7acba79044fc3850a61971fec615632e5 (diff)
downloadjgit-8c60468ff4cae4a13f57ed4a1822cec7cb2ba22a.zip
jgit-8c60468ff4cae4a13f57ed4a1822cec7cb2ba22a.tar.gz
jgit-8c60468ff4cae4a13f57ed4a1822cec7cb2ba22a.tar.bz2
Allow to amend commits with JGit CLIrefs/changes/54/4854/1
-rw-r--r--org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties1
-rw-r--r--org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
index b57b1d7..cefa074 100644
--- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
+++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/CLIText.properties
@@ -141,6 +141,7 @@ usage_CommandLineClientForamazonsS3Service=Command line client for Amazon's S3 s
usage_CommitAuthor=Override the author name used in the commit. You can use the standard A U Thor <author@example.com> format.
usage_CommitMessage=Use the given <msg> as the commit message
usage_CommitOnly=commit specified paths only
+usage_CommitAmend=Amend the tip of the current branch
usage_CommitPaths=see --only
usage_CreateABareRepository=Create a bare repository
usage_CreateATag=Create a tag
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
index ba66a30..2ff9aa6 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Commit.java
@@ -67,6 +67,9 @@ class Commit extends TextBuiltin {
@Option(name = "--only", aliases = { "-o" }, usage = "usage_CommitOnly")
private boolean only;
+ @Option(name = "--amend", usage = "usage_CommitAmend")
+ private boolean amend;
+
@Argument(metaVar = "metaVar_commitPaths", usage = "usage_CommitPaths")
private List<String> paths = new ArrayList<String>();
@@ -83,6 +86,7 @@ class Commit extends TextBuiltin {
if (!paths.isEmpty())
for (String p : paths)
commitCmd.setOnly(p);
+ commitCmd.setAmend(amend);
Ref head = db.getRef(Constants.HEAD);
RevCommit commit = commitCmd.call();