From: David Pursehouse <david.pursehouse@gmail.com>
Date: Sun, 20 Jan 2019 05:39:52 +0000 (+0900)
Subject: CheckoutCommandTest: Add comment to document intentionally empty catch block
X-Git-Tag: v5.3.0.201903061415-rc1~1^2~112
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F135390%2F1;p=jgit.git

CheckoutCommandTest: Add comment to document intentionally empty catch block

Change-Id: I5156c3c2de67be015ef1d785fcf6084919765635
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
---

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
index 749c344f23..98a8adcc58 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java
@@ -145,6 +145,7 @@ public class CheckoutCommandTest extends RepositoryTestCase {
 			git.checkout().setName("master").call().getObjectId();
 			fail("Expected CheckoutConflictException didn't occur");
 		} catch (CheckoutConflictException e) {
+			// Expected
 		}
 		assertEquals(initialCommit.getId(), git.checkout().setName("master")
 				.setForced(true).call().getObjectId());