From 15adcefb73a48ee11ec1b231a2ebf8c18e15e53f Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Wed, 7 Aug 2013 15:43:58 -0700 Subject: [PATCH] Allow UploadPack requests with no options UploadPack can be invoked with no capabilities selected by the client if the client is an ancient version of Git that nobody in their right mind should still be using. Or if the client is very broken and does not want to use any of the newer features added to the protocol since its inception. Change-Id: I3baa6f90e6a41a37a8eab8449a3cc41f4efcb91a --- .../src/org/eclipse/jgit/transport/UploadPack.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 836376ce11..f0ee974177 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -868,10 +868,13 @@ public class UploadPack { if (!line.startsWith("want ") || line.length() < 45) //$NON-NLS-1$ throw new PackProtocolException(MessageFormat.format(JGitText.get().expectedGot, "want", line)); //$NON-NLS-1$ - if (isFirst && line.length() > 45) { - final FirstLine firstLine = new FirstLine(line); - options = firstLine.getOptions(); - line = firstLine.getLine(); + if (isFirst) { + if (line.length() > 45) { + FirstLine firstLine = new FirstLine(line); + options = firstLine.getOptions(); + line = firstLine.getLine(); + } else + options = Collections.emptySet(); } wantIds.add(ObjectId.fromString(line.substring(5))); -- 2.39.5