Browse Source

Merge "Use bitcheck to check for presence of OPT_FULL option"

stable-3.5
Robin Rosenberg 10 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
b397e7b6e0
  1. 7
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java

7
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackBitmapIndexV1.java

@ -110,15 +110,10 @@ class PackBitmapIndexV1 extends BasePackBitmapIndex {
// Read the options (2 bytes) // Read the options (2 bytes)
final int opts = NB.decodeUInt16(scratch, 6); final int opts = NB.decodeUInt16(scratch, 6);
switch (opts) { if ((opts & OPT_FULL) == 0)
case OPT_FULL:
// Bitmaps are self contained within this file.
break;
default:
throw new IOException(MessageFormat.format( throw new IOException(MessageFormat.format(
JGitText.get().expectedGot, Integer.valueOf(OPT_FULL), JGitText.get().expectedGot, Integer.valueOf(OPT_FULL),
Integer.valueOf(opts))); Integer.valueOf(opts)));
}
// Read the number of entries (1 int32) // Read the number of entries (1 int32)
long numEntries = NB.decodeUInt32(scratch, 8); long numEntries = NB.decodeUInt32(scratch, 8);

Loading…
Cancel
Save