diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-01-13 00:51:28 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-01-13 00:51:28 +0100 |
| commit | e72b2771a0b90fea4a0604a326a9dec7894bfff9 (patch) | |
| tree | 2d72883ec3c5bc341d7f8b35721ca322c37d30f2 /org.eclipse.jgit.test/tst/org/eclipse/jgit | |
| parent | 757fecd697a0074a9132ba87dddfe5472498e491 (diff) | |
| parent | bea3b46678c0b53ed7212a1190c4a8bb8b9002a4 (diff) | |
| download | jgit-e72b2771a0b90fea4a0604a326a9dec7894bfff9.tar.gz jgit-e72b2771a0b90fea4a0604a326a9dec7894bfff9.zip | |
Merge branch 'stable-4.9' into stable-4.10
* stable-4.9:
Revert handling of ssh IdentityFile to pre-4.9 behavior
Change-Id: I7cd2f0fe93be5193d6de2a376a023bdece5d84a9
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse/jgit')
| -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 |