github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Merge "Adapt expected commit message in tests"

stable-0.11
Chris Aniszczyk 14 years ago committed by Code Review
parent
29ed09a44f 8a635668ec
commit
80362df5aa
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
Unescape View File

@ -364,7 +364,7 @@ public class MergeCommandTest extends RepositoryTestCase {
assertEquals(thirdCommit, newHead.getParent(0)); assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1)); assertEquals(secondCommit, newHead.getParent(1));
assertEquals( assertEquals(
"Merge commit '3fa334456d236a92db020289fe0bf481d91777b4' into HEAD", "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4'",
newHead.getFullMessage()); newHead.getFullMessage());
// @TODO fix me // @TODO fix me
assertEquals(RepositoryState.SAFE, db.getRepositoryState()); assertEquals(RepositoryState.SAFE, db.getRepositoryState());
@ -425,7 +425,7 @@ public class MergeCommandTest extends RepositoryTestCase {
assertEquals(thirdCommit, newHead.getParent(0)); assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1)); assertEquals(secondCommit, newHead.getParent(1));
assertEquals( assertEquals(
"Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879' into HEAD", "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879'",
newHead.getFullMessage()); newHead.getFullMessage());
assertEquals(RepositoryState.SAFE, db.getRepositoryState()); assertEquals(RepositoryState.SAFE, db.getRepositoryState());

Write Preview
Loading…
Cancel
Save