diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-20 14:42:56 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-20 14:58:50 +0200 |
| commit | 48b0781cfe0c5e6616c5d2b51b8d7c7f070bb91e (patch) | |
| tree | 24c2ec677388b9f91ac2d79a84ac4b1108460eb3 /org.eclipse.jgit.junit.ssh/src | |
| parent | c7335f32e93b005fe681ed91873396a6d07886ad (diff) | |
| parent | 4f662a26f981f0d2c21a8b288ad4165812988a48 (diff) | |
| download | jgit-48b0781cfe0c5e6616c5d2b51b8d7c7f070bb91e.tar.gz jgit-48b0781cfe0c5e6616c5d2b51b8d7c7f070bb91e.zip | |
Merge branch 'stable-5.10' into stable-5.11
* stable-5.10:
Add missing since tag for SshTestHarness#publicKey2
Silence API errors
Prevent infinite loop rescanning the pack list on
PackMismatchException
Remove blank in maven.config
Migrated "Prevent infinite loop rescanning the pack list on
PackMismatchException" to refactoring done in
https://git.eclipse.org/r/q/topic:restore-preserved-packs
Change-Id: I0fb77bb9b498d48d5da88a93486b99bf8121e3bd
Diffstat (limited to 'org.eclipse.jgit.junit.ssh/src')
| -rw-r--r-- | org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java index 90d981b772..a28d5ebd98 100644 --- a/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java +++ b/org.eclipse.jgit.junit.ssh/src/org/eclipse/jgit/junit/ssh/SshTestHarness.java @@ -76,6 +76,9 @@ public abstract class SshTestHarness extends RepositoryTestCase { protected File publicKey1; + /** + * @since 5.10 + */ protected File publicKey2; protected SshTestGitServer server; |