From a35c793b2d3a1c29a55ee96123109b3c80ab15e3 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Sat, 5 Feb 2011 17:49:01 -0800 Subject: [PATCH] UploadPack: Fix want-is-satisfied test okToGiveUpImp() has been missing a ! for a long time. This loop over wantAll() is looking for an object where wantSatisfied() returns false, because there is no common merge base present. Unfortunately it was missing a !, causing the loop to break and return false after at least one want was satisified. Bug: 301639 Change-Id: Ifdbe0b22c9cd0a9181546d090b4990d792d70c82 Signed-off-by: Shawn O. Pearce --- org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4ff1c5c5a..69bba0341 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -586,7 +586,7 @@ private boolean okToGiveUpImp() throws PackProtocolException { try { for (RevObject obj : wantAll) { - if (wantSatisfied(obj)) + if (!wantSatisfied(obj)) return false; } return true;