]> source.dussan.org Git - jgit.git/commitdiff
CheckoutCommandTest: Add comment to document intentionally empty catch block 90/135390/1
authorDavid Pursehouse <david.pursehouse@gmail.com>
Sun, 20 Jan 2019 05:39:52 +0000 (14:39 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Sun, 20 Jan 2019 05:39:52 +0000 (14:39 +0900)
Change-Id: I5156c3c2de67be015ef1d785fcf6084919765635
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java

index 749c344f23d985e87baf5925f05de3b6d66334d6..98a8adcc586f4bac98b0a3d42bdee9f2ba23b654 100644 (file)
@@ -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());