Merge fix to correctly cope with no-op fetches in the server.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 17 Oct 2010 02:31:07 +0000 (04:31 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 17 Oct 2010 02:31:07 +0000 (04:31 +0200)
1  2 
NEWS
dulwich/repo.py

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,12 -1,4 +1,17 @@@
 -0.6.2 UNRELEASED
 +0.7.0 UNRELEASED
 +
 + FEATURES
 +
 +  * Add Tree.items(). (Jelmer Vernooij)
 +
 +  * Add eof() and unread_pkt_line() methods to Protocol. (Dave Borowitz)
 +
++ BUG FIXES
++
++  * Correct short-circuiting operation for no-op fetches in the server.
++    (Dave Borowitz)
++
 +0.6.2 2010-10-16
  
   BUG FIXES
  
diff --cc dulwich/repo.py
Simple merge