Browse Source

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>
stable-1.0
Robin Stocker 14 years ago
parent
commit
a31590ff63
  1. 7
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java
  2. 2
      org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java

7
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; import org.junit.Test;
/** /**
* Test cherry-pick command * Test revert command
*/ */
public class RevertCommandTest extends RepositoryTestCase { public class RevertCommandTest extends RepositoryTestCase {
@Test @Test
@ -90,7 +90,10 @@ public class RevertCommandTest extends RepositoryTestCase {
checkFile(new File(db.getWorkTree(), "a"), checkFile(new File(db.getWorkTree(), "a"),
"first line\nsec. line\nthird line\nfourth line\n"); "first line\nsec. line\nthird line\nfourth line\n");
Iterator<RevCommit> history = git.log().call().iterator(); 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 b", history.next().getFullMessage());
assertEquals("fixed a", history.next().getFullMessage()); assertEquals("fixed a", history.next().getFullMessage());
assertEquals("enlarged a", history.next().getFullMessage()); assertEquals("enlarged a", history.next().getFullMessage());

2
org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java

@ -149,7 +149,7 @@ public class RevertCommand extends GitCommand<RevCommit> {
String newMessage = "Revert \"" String newMessage = "Revert \""
+ srcCommit.getShortMessage() + "\"" + "\n\n" + srcCommit.getShortMessage() + "\"" + "\n\n"
+ "This reverts commit " + "This reverts commit "
+ srcCommit.getId().getName() + "\n"; + srcCommit.getId().getName() + ".\n";
newHead = new Git(getRepository()).commit().setMessage( newHead = new Git(getRepository()).commit().setMessage(
newMessage).call(); newMessage).call();
revertedRefs.add(src); revertedRefs.add(src);

Loading…
Cancel
Save