summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorShawn Pearce <sop@google.com>2012-06-27 10:26:40 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2012-06-27 10:26:40 -0400
commit2d1124b89bbe739cf828c57a104a7b48e26c5db9 (patch)
treea331865e60855e09339ef155273bfdcb838f6d14 /org.eclipse.jgit
parent2444aa231a3a9618a413b7e42e8120b42258702d (diff)
parent94f67a9cdc4a0855cec0d45dd77f703973893e9a (diff)
downloadjgit-2d1124b89bbe739cf828c57a104a7b48e26c5db9.tar.gz
jgit-2d1124b89bbe739cf828c57a104a7b48e26c5db9.zip
Merge "Disable PackParser EOF check if more data expected"
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
index 461f9333dd..12ad733b0f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
@@ -924,7 +924,8 @@ public abstract class BaseReceivePack {
parser.setAllowThin(true);
parser.setNeedNewObjectIds(checkReferencedIsReachable);
parser.setNeedBaseObjectIds(checkReferencedIsReachable);
- parser.setCheckEofAfterPackFooter(!biDirectionalPipe);
+ parser.setCheckEofAfterPackFooter(!biDirectionalPipe
+ && !isExpectDataAfterPackFooter());
parser.setExpectDataAfterPackFooter(isExpectDataAfterPackFooter());
parser.setObjectChecking(isCheckReceivedObjects());
parser.setLockMessage(lockMsg);