]> source.dussan.org Git - jgit.git/commitdiff
Disable PackParser EOF check if more data expected 23/6523/1
authorIan Wetherbee <wetherbeei@google.com>
Tue, 26 Jun 2012 23:42:09 +0000 (16:42 -0700)
committerIan Wetherbee <wetherbeei@google.com>
Tue, 26 Jun 2012 23:42:09 +0000 (16:42 -0700)
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

org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java

index 461f9333dd77850a2609d05564420554d56a471f..12ad733b0f099a7e92a26008889e5c4ed1843f98 100644 (file)
@@ -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);