Browse Source

Fix capability negotiation when fetching packs over HTTP.

William Grant 11 years ago
parent
commit
43dcbd247f
2 changed files with 4 additions and 1 deletions
  1. 3 0
      NEWS
  2. 1 1
      dulwich/client.py

+ 3 - 0
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

+ 1 - 1
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]