Fix capability negotiation when fetching packs over HTTP.

diff --git a/NEWS b/NEWS
index 8816023b79f0033cdf8f56595afe1b6c87f9d155..97579e9d4c0d46670d7658762f9f511c747dddfd 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@
 
   * Fix fetching packs with side-band-64k capability disabled. (David Keijser, Jelmer Vernooij)
 
+  * Fix capability negotiation when fetching packs over HTTP.
+    (#1072461, William Grant)
+
 0.9.0  2013-05-31
 
  BUG FIXES

diff --git a/dulwich/client.py b/dulwich/client.py
index 5f92d2803fbed7f5188b4d67305e8b1aecf8f170..b57dfb7eed74325bf112c69e0735bbfacd54ce51 100644 (file)
--- a/dulwich/client.py
+++ b/dulwich/client.py
@@ -748,7 +748,7 @@ class HttpGitClient(GitClient):
         url = self._get_url(path)
         refs, server_capabilities = self._discover_references(
             "git-upload-pack", url)
-        negotiated_capabilities = server_capabilities
+        negotiated_capabilities = self._fetch_capabilities & server_capabilities
         wants = determine_wants(refs)
         if wants is not None:
             wants = [cid for cid in wants if cid != ZERO_SHA]