diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2013-04-04 03:41:56 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-04-04 03:41:56 -0400 |
| commit | ac0481039da211261248bfba1683f489dc341d92 (patch) | |
| tree | 8dd931ab6c62dd2a2f2014080465d81731a4765d /org.eclipse.jgit.test | |
| parent | 5cf53fdacf28d5cabe7ad1ed154fe7f4971225a9 (diff) | |
| parent | 65027d8bb429581635f51d0c588493e5c458cc25 (diff) | |
| download | jgit-ac0481039da211261248bfba1683f489dc341d92.tar.gz jgit-ac0481039da211261248bfba1683f489dc341d92.zip | |
Merge "Indicate initial commit on a branch in the reflog"
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ReflogCommandTest.java | 6 |
2 files changed, 6 insertions, 4 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 dfd5c54761..cf9573e44c 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 @@ -96,10 +96,10 @@ public class MergeCommandTest extends RepositoryTestCase { MergeResult result = git.merge().include(db.getRef(Constants.HEAD)).call(); assertEquals(MergeResult.MergeStatus.ALREADY_UP_TO_DATE, result.getMergeStatus()); // no reflog entry written by merge - assertEquals("commit: initial commit", + assertEquals("commit (initial): initial commit", db .getReflogReader(Constants.HEAD).getLastEntry().getComment()); - assertEquals("commit: initial commit", + assertEquals("commit (initial): initial commit", db .getReflogReader(db.getBranch()).getLastEntry().getComment()); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ReflogCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ReflogCommandTest.java index a30b4963f9..318d1f98b9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ReflogCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ReflogCommandTest.java @@ -90,7 +90,8 @@ public class ReflogCommandTest extends RepositoryTestCase { assertNotNull(reflog); assertEquals(3, reflog.size()); ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[reflog.size()]); - assertEquals(reflogs[2].getComment(), "commit: Initial commit"); + assertEquals(reflogs[2].getComment(), + "commit (initial): Initial commit"); assertEquals(reflogs[2].getNewId(), commit1.getId()); assertEquals(reflogs[2].getOldId(), ObjectId.zeroId()); assertEquals(reflogs[1].getComment(), @@ -136,7 +137,8 @@ public class ReflogCommandTest extends RepositoryTestCase { assertNotNull(reflog); assertEquals(4, reflog.size()); ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[reflog.size()]); - assertEquals(reflogs[3].getComment(), "commit: Initial commit"); + assertEquals(reflogs[3].getComment(), + "commit (initial): Initial commit"); assertEquals(reflogs[3].getNewId(), commit1.getId()); assertEquals(reflogs[3].getOldId(), ObjectId.zeroId()); assertEquals(reflogs[2].getComment(), |