Change-Id: I5156c3c2de67be015ef1d785fcf6084919765635 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>tags/v5.3.0.201903061415-rc1
@@ -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()); |