diff options
| author | Robin Stocker <robin@nibor.org> | 2011-02-02 16:11:39 +0100 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2011-02-02 16:11:39 +0100 |
| commit | 8a635668ecf0a3db38196a72b5f0bb8f6bef685e (patch) | |
| tree | bd0f5bf1f6cdd46966038b4a11a631a266ea51ab | |
| parent | b0245b548b9c9fe1801fb8af727b08a7c3cc9706 (diff) | |
| download | jgit-8a635668ecf0a3db38196a72b5f0bb8f6bef685e.tar.gz jgit-8a635668ecf0a3db38196a72b5f0bb8f6bef685e.zip | |
Adapt expected commit message in tests
Because of change I28ae5713, the commit message lost the "into HEAD" and
caused the MergeCommandTest to fail. This change fixes it.
Bug: 336059
Change-Id: Ifac0138c6c6d66c40d7295b5e11ff3cd98bc9e0c
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java index a35396cc9f..0ef24bd8a5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java @@ -364,7 +364,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(thirdCommit, newHead.getParent(0)); assertEquals(secondCommit, newHead.getParent(1)); assertEquals( - "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4' into HEAD", + "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4'", newHead.getFullMessage()); // @TODO fix me assertEquals(RepositoryState.SAFE, db.getRepositoryState()); @@ -425,7 +425,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(thirdCommit, newHead.getParent(0)); assertEquals(secondCommit, newHead.getParent(1)); assertEquals( - "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879' into HEAD", + "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879'", newHead.getFullMessage()); assertEquals(RepositoryState.SAFE, db.getRepositoryState()); |