diff options
| author | Dave Borowitz <dborowitz@google.com> | 2013-06-21 16:14:30 -0700 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2013-08-21 14:44:46 +0200 |
| commit | bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3 (patch) | |
| tree | 350d2da35cb03891922577f124fc0ba2f061b819 | |
| parent | 8a7f4864d8189ddb19fb3f03de686e19e51bd02c (diff) | |
| download | jgit-bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3.tar.gz jgit-bbea37a9e354bf5f7c2e673cfd0b0f1ef92f80d3.zip | |
Don't skip want validation when the client sends no haves
Change-Id: I5e80b3befca5cf1dcb06075862d6d48e6491cc0f
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 4 |
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; |