diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2017-11-22 11:31:20 +0900 |
|---|---|---|
| committer | David Pursehouse <david.pursehouse@gmail.com> | 2017-11-22 11:31:29 +0900 |
| commit | bd052b94aa5349f34515763f442d9a0456c630fa (patch) | |
| tree | 50394a582e467f2b896f8a4ef6f07715c6befe1f /org.eclipse.jgit.test/tst/org/eclipse | |
| parent | 8b3ab4343c4d34993176b5fa799a039e8114054b (diff) | |
| parent | 5284cc1bf764207343a43effccdcada02c05b2bd (diff) | |
| download | jgit-bd052b94aa5349f34515763f442d9a0456c630fa.tar.gz jgit-bd052b94aa5349f34515763f442d9a0456c630fa.zip | |
Merge branch 'stable-4.9'
* stable-4.9:
Yet another work-around for a Jsch bug: timeouts
Change-Id: I7cf227c62a3c06f91cee1a6c61719b6fe50da883
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java index d604751fef..8ce3f0f147 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java @@ -343,8 +343,7 @@ public class OpenSshConfigTest extends RepositoryTestCase { assertEquals(h1.getConnectionAttempts(), h2.getConnectionAttempts()); final ConfigRepository.Config c = osc.getConfig("orcz"); assertNotNull(c); - assertSame(c, h1.getConfig()); - assertSame(c, h2.getConfig()); + assertSame(h1.getConfig(), h2.getConfig()); } @Test |