Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Borowitz2013-06-21 23:14:30 +0000
committerMatthias Sohn2013-08-21 12:44:46 +0000
commitbbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3 (patch)
tree350d2da35cb03891922577f124fc0ba2f061b819
parent8a7f4864d8189ddb19fb3f03de686e19e51bd02c (diff)
downloadjgit-bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3.tar.gz
jgit-bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3.tar.xz
jgit-bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3.zip
Don't skip want validation when the client sends no haves
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
index 5347eb713c..808cd73df9 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
@@ -786,10 +786,10 @@ public class UploadPack {
private ObjectId processHaveLines(List<ObjectId> peerHas, ObjectId last)
throws IOException {
preUploadHook.onBeginNegotiateRound(this, wantIds, peerHas.size());
- if (peerHas.isEmpty())
- return last;
if (wantAll.isEmpty() && !wantIds.isEmpty())
parseWants();
+ if (peerHas.isEmpty())
+ return last;
sentReady = false;
int haveCnt = 0;

Back to the top