diff options
author | Thomas Wolf <thomas.wolf@paranor.ch> | 2020-11-03 23:33:19 +0100 |
---|---|---|
committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2020-11-03 23:50:21 +0100 |
commit | d69fb4d4ac7bcf7d0d84109bba56cf944646fb24 (patch) | |
tree | 12a796e526b04e9207ef7f05b28d263154150053 /org.eclipse.jgit.ssh.jsch.test/tst/org | |
parent | 5dcc46591aa1ad63f19e5240eff2cabe6bb9f306 (diff) | |
download | jgit-d69fb4d4ac7bcf7d0d84109bba56cf944646fb24.tar.gz jgit-d69fb4d4ac7bcf7d0d84109bba56cf944646fb24.zip |
Revert "Client-side protocol V2 support for fetching"
This reverts commit f802f06e7fd5a98f256b7b7727598491f563bf2f.
I had misunderstood how protocol V2 works. This implementation only
works if the negotiation during fetch is done in one round.
Fixing this is substantial work in BasePackFetchConnection. Basically
I think I'd have to change back negotiate to the V0 version, and have
a doFetch() that does
if protocol V2
doFetchV2()
else
doFetchV0()
with doFetchV0 the old code, and doFetchV2 completely new.
Plus there would need to be a HTTP test case requiring several
negotiation rounds.
This is a couple of days work at least, and I don't know when I will
have the time to revisit this. So although the rest of the code is
fine I prefer to back this out completely and not leave a only half
working implementation in the code for an indeterminate time.
Bug: 553083
Change-Id: Icbbbb09882b3b83f9897deac4a06d5f8dc99d84e
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.ssh.jsch.test/tst/org')
-rw-r--r-- | org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/JSchSshProtocol2Test.java | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/JSchSshProtocol2Test.java b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/JSchSshProtocol2Test.java deleted file mode 100644 index f094448e53..0000000000 --- a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/JSchSshProtocol2Test.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2020 Thomas Wolf <thomas.wolf@paranor.ch> and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -//TODO(ms): move to org.eclipse.jgit.ssh.jsch in 6.0 -package org.eclipse.jgit.transport; - -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.lib.StoredConfig; - -public class JSchSshProtocol2Test extends JSchSshTest { - - @Override - public void setUp() throws Exception { - super.setUp(); - StoredConfig config = ((Repository) db).getConfig(); - config.setInt("protocol", null, "version", 2); - config.save(); - } -} |