From a31590ff63bbaad6b99036b32d6cdb4b647e5d6b Mon Sep 17 00:00:00 2001 From: Robin Stocker Date: Fri, 13 May 2011 13:39:54 +0200 Subject: [PATCH] RevertCommand: Add "." after reverted commit id This makes the message look the same as in C Git (the "."): This reverts commit . Change-Id: I4c254c122277b127e7b039c0d1c7f7a0d691530d Signed-off-by: Robin Stocker --- .../tst/org/eclipse/jgit/api/RevertCommandTest.java | 7 +++++-- .../src/org/eclipse/jgit/api/RevertCommand.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java index 9eb44db86..38e7af50f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java @@ -55,7 +55,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Test; /** - * Test cherry-pick command + * Test revert command */ public class RevertCommandTest extends RepositoryTestCase { @Test @@ -90,7 +90,10 @@ public class RevertCommandTest extends RepositoryTestCase { checkFile(new File(db.getWorkTree(), "a"), "first line\nsec. line\nthird line\nfourth line\n"); Iterator history = git.log().call().iterator(); - assertEquals("Revert \"fixed a\"", history.next().getShortMessage()); + RevCommit revertCommit = history.next(); + String expectedMessage = "Revert \"fixed a\"\n\n" + + "This reverts commit " + fixingA.getId().getName() + ".\n"; + assertEquals(expectedMessage, revertCommit.getFullMessage()); assertEquals("fixed b", history.next().getFullMessage()); assertEquals("fixed a", history.next().getFullMessage()); assertEquals("enlarged a", history.next().getFullMessage()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index 57c69cc08..878d95770 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -149,7 +149,7 @@ public class RevertCommand extends GitCommand { String newMessage = "Revert \"" + srcCommit.getShortMessage() + "\"" + "\n\n" + "This reverts commit " - + srcCommit.getId().getName() + "\n"; + + srcCommit.getId().getName() + ".\n"; newHead = new Git(getRepository()).commit().setMessage( newMessage).call(); revertedRefs.add(src);