RevertCommand: Add "." after reverted commit id

This makes the message look the same as in C Git (the "."):

  This reverts commit <sha1>.

Change-Id: I4c254c122277b127e7b039c0d1c7f7a0d691530d
Signed-off-by: Robin Stocker <robin@nibor.org>

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 9eb44db8661b0e83de64a29491abb67207865b1c..38e7af50faff65e519492b9aca977aca92322799 100644 (file)
--- 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<RevCommit> 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 57c69cc08a82d5115cef241d69d9f30e8efd0f4b..878d9577062f9a4988ab12b3c90dcf5444598b7e 100644 (file)
--- 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<RevCommit> {
                                        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);