Merge branch 'stable-6.10' into stable-7.0

* stable-6.10:
  PackDirectory: Filter out tmp GC pack files
  Test advertised capabilities with protocol V0 and allow*Sha1InWant
  Align request policies with CGit
  Pack.java: Recover more often in Pack.copyAsIs2()

Change-Id: Ib301efa54aaf2196d764a0fc1f91f652b4d68396

1 files changed, 42 insertions, 0 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
index def73acadd..017104c527 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java
@@ -11,6 +11,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -564,6 +565,47 @@ public class UploadPackTest {
 	}
 
 	@Test
+	public void testV0CapabilitiesAllowAnySha1InWant() throws Exception {
+		checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack",
+				"allowanysha1inwant", "allow-reachable-sha1-in-want",
+				"allow-tip-sha1-in-want");
+	}
+
+	@Test
+	public void testV0CapabilitiesAllowReachableSha1InWant() throws Exception {
+		checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack",
+				"allowreachablesha1inwant", "allow-reachable-sha1-in-want");
+	}
+
+	@Test
+	public void testV0CapabilitiesAllowTipSha1InWant() throws Exception {
+		checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack",
+				"allowtipsha1inwant", "allow-tip-sha1-in-want");
+	}
+
+	private void checkAvertisedCapabilityProtocolV0IfAllowed(
+			String configSection, String configName, String... capabilities)
+			throws Exception {
+		server.getConfig().setBoolean(configSection, null, configName, true);
+		ByteArrayInputStream recvStream = uploadPackSetup(
+				TransferConfig.ProtocolVersion.V0.version(), null,
+				PacketLineIn.end());
+		PacketLineIn pckIn = new PacketLineIn(recvStream);
+
+		String line;
+		while (!PacketLineIn.isEnd((line = pckIn.readString()))) {
+			if (line.contains("capabilities")) {
+				List<String> linesCapabilities = Arrays.asList(line.substring(
+						line.indexOf(" ", line.indexOf("capabilities")) + 1)
+						.split(" "));
+				assertThat(linesCapabilities, hasItems(capabilities));
+				return;
+			}
+		}
+		fail("Server side protocol did not contain any capabilities'");
+	}
+
+	@Test
 	public void testV2CapabilitiesAllowFilter() throws Exception {
 		checkAdvertisedIfAllowed("uploadpack", "allowfilter", "filter");
 		checkUnadvertisedIfUnallowed("uploadpack", "allowfilter", "filter");