Shawn O. PearceIf the remote repository has no commits we received an exception about "capabilities^{} coming before capabilities". This happens because we didn't correctly ignore the dummy capability ref line.
http://code.google.com/p/egit/issues/detail?id=34
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- .../spearce/jgit/transport/BasePackConnection.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
Show changes to org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java +6 −6
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java index 184a5fd..2d145a6 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java +++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackConnection.java @@ -147,18 +147,18 @@ for (String c : line.substring(nul + 1).split(" ")) remoteCapablities.add(c); line = line.substring(0, nul); } - - if (line.equals("capabilities^{}")) { - // special line from git-receive-pack to show - // capabilities when there are no refs to advertise - continue; - } } if (line.length() == 0) break; String name = line.substring(41, line.length()); + if (avail.isEmpty() && name.equals("capabilities^{}")) { + // special line from git-receive-pack to show + // capabilities when there are no refs to advertise + continue; + } + final ObjectId id = ObjectId.fromString(line.substring(0, 40)); if (name.endsWith("^{}")) { name = name.substring(0, name.length() - 3);
-- 1.6.0.1.337.g5c7d67