diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-01-13 00:54:31 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-01-13 01:06:42 +0100 |
| commit | 28aa3be21be496a61e63063994498c3ad380fa63 (patch) | |
| tree | f194fc4605c86729b6ac5cc9db3774764785cd41 /org.eclipse.jgit.test | |
| parent | 1842c70b8da5383a698d6adcd8c9ca68310100ef (diff) | |
| parent | e72b2771a0b90fea4a0604a326a9dec7894bfff9 (diff) | |
| download | jgit-28aa3be21be496a61e63063994498c3ad380fa63.tar.gz jgit-28aa3be21be496a61e63063994498c3ad380fa63.zip | |
Merge branch 'stable-4.10'
* stable-4.10:
Revert handling of ssh IdentityFile to pre-4.9 behavior
Prepare 4.10.1-SNAPSHOT builds
JGit v4.10.0.201712302008-r
Change-Id: I13797f064de919c257feb8e96da226d7b1faaf7a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/OpenSshConfigTest.java | 3 |
1 files changed, 2 insertions, 1 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 8ce3f0f147..d604751fef 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,7 +343,8 @@ public class OpenSshConfigTest extends RepositoryTestCase { assertEquals(h1.getConnectionAttempts(), h2.getConnectionAttempts()); final ConfigRepository.Config c = osc.getConfig("orcz"); assertNotNull(c); - assertSame(h1.getConfig(), h2.getConfig()); + assertSame(c, h1.getConfig()); + assertSame(c, h2.getConfig()); } @Test |