diff options
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java index 57888e70a8..ff7066e8bf 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java @@ -140,11 +140,12 @@ public class PullCommandTest extends RepositoryTestCase { ObjectId[] mergedCommits = mergeResult.getMergedCommits(); assertEquals(targetCommit.getId(), mergedCommits[0]); assertEquals(sourceCommit.getId(), mergedCommits[1]); - RevCommit mergeCommit = new RevWalk(dbTarget).parseCommit(mergeResult - .getNewHead()); - String message = "Merge branch 'master' of " - + db.getWorkTree().getAbsolutePath(); - assertEquals(message, mergeCommit.getShortMessage()); + try (RevWalk rw = new RevWalk(dbTarget)) { + RevCommit mergeCommit = rw.parseCommit(mergeResult.getNewHead()); + String message = "Merge branch 'master' of " + + db.getWorkTree().getAbsolutePath(); + assertEquals(message, mergeCommit.getShortMessage()); + } } @Test @@ -259,11 +260,12 @@ public class PullCommandTest extends RepositoryTestCase { ObjectId[] mergedCommits = mergeResult.getMergedCommits(); assertEquals(targetCommit.getId(), mergedCommits[0]); assertEquals(sourceCommit.getId(), mergedCommits[1]); - RevCommit mergeCommit = new RevWalk(dbTarget).parseCommit(mergeResult - .getNewHead()); - String message = "Merge branch 'other' of " - + db.getWorkTree().getAbsolutePath(); - assertEquals(message, mergeCommit.getShortMessage()); + try (RevWalk rw = new RevWalk(dbTarget)) { + RevCommit mergeCommit = rw.parseCommit(mergeResult.getNewHead()); + String message = "Merge branch 'other' of " + + db.getWorkTree().getAbsolutePath(); + assertEquals(message, mergeCommit.getShortMessage()); + } } @Test @@ -293,11 +295,12 @@ public class PullCommandTest extends RepositoryTestCase { ObjectId[] mergedCommits = mergeResult.getMergedCommits(); assertEquals(targetCommit.getId(), mergedCommits[0]); assertEquals(sourceCommit.getId(), mergedCommits[1]); - RevCommit mergeCommit = new RevWalk(dbTarget).parseCommit(mergeResult - .getNewHead()); - String message = "Merge branch 'other' of " - + db.getWorkTree().getAbsolutePath() + " into other"; - assertEquals(message, mergeCommit.getShortMessage()); + try (RevWalk rw = new RevWalk(dbTarget)) { + RevCommit mergeCommit = rw.parseCommit(mergeResult.getNewHead()); + String message = "Merge branch 'other' of " + + db.getWorkTree().getAbsolutePath() + " into other"; + assertEquals(message, mergeCommit.getShortMessage()); + } } private enum TestPullMode { |