diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-03-29 23:59:21 +0100 |
|---|---|---|
| committer | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-04-02 21:57:17 +0200 |
| commit | 65027d8bb429581635f51d0c588493e5c458cc25 (patch) | |
| tree | 506fba571e45a8429acae393706bd9a714f3cf1f /org.eclipse.jgit.test | |
| parent | 4796fe70432d882f1d51d9fec59c111107be44f8 (diff) | |
| download | jgit-65027d8bb429581635f51d0c588493e5c458cc25.tar.gz jgit-65027d8bb429581635f51d0c588493e5c458cc25.zip | |
Indicate initial commit on a branch in the reflog
Bug: 393463
Change-Id: I4733d6f719bc0dc694e7a6a6ad2092de6364898c
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(), |