From bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Fri, 21 Jun 2013 16:14:30 -0700 Subject: [PATCH] Don't skip want validation when the client sends no haves Change-Id: I5e80b3befca5cf1dcb06075862d6d48e6491cc0f --- .../src/org/eclipse/jgit/transport/UploadPack.java | 4 ++-- 1 file 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 5347eb713..808cd73df 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 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;