summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Wetherbee <wetherbeei@google.com>2012-06-26 16:42:09 -0700
committerIan Wetherbee <wetherbeei@google.com>2012-06-26 16:42:09 -0700
commit94f67a9cdc4a0855cec0d45dd77f703973893e9a (patch)
tree7fc3482ec1c44aafd33899906b6443f9d3a47ebe
parent6ba8b038ceaae861650825d5830f014584c8ddf8 (diff)
downloadjgit-94f67a9cdc4a0855cec0d45dd77f703973893e9a.tar.gz
jgit-94f67a9cdc4a0855cec0d45dd77f703973893e9a.zip
Disable PackParser EOF check if more data expected
The PackParser EOF check is incompatible with the expect data after pack footer flag, so turn off the EOF check if the expecting data flag is true. Change-Id: I697ebd9e1d1eed765d00aecaef955cf978cfd0b9
-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);