|
|
@@ -615,26 +615,25 @@ public class GC { |
|
|
|
|
|
|
|
while (treeWalk.next()) { |
|
|
|
ObjectId objectId = treeWalk.getObjectId(0); |
|
|
|
switch (treeWalk.getRawMode(0) & FileMode.TYPE_MASK) { |
|
|
|
case FileMode.TYPE_MISSING: |
|
|
|
case FileMode.TYPE_GITLINK: |
|
|
|
continue; |
|
|
|
case FileMode.TYPE_TREE: |
|
|
|
case FileMode.TYPE_FILE: |
|
|
|
case FileMode.TYPE_SYMLINK: |
|
|
|
ret.add(objectId); |
|
|
|
continue; |
|
|
|
default: |
|
|
|
switch (treeWalk.getRawMode(0) & FileMode.TYPE_MASK) { |
|
|
|
case FileMode.TYPE_MISSING: |
|
|
|
case FileMode.TYPE_GITLINK: |
|
|
|
continue; |
|
|
|
case FileMode.TYPE_TREE: |
|
|
|
case FileMode.TYPE_FILE: |
|
|
|
case FileMode.TYPE_SYMLINK: |
|
|
|
ret.add(objectId); |
|
|
|
continue; |
|
|
|
default: |
|
|
|
throw new IOException(MessageFormat.format( |
|
|
|
JGitText.get().corruptObjectInvalidMode3, String |
|
|
|
.format("%o", Integer.valueOf(treeWalk //$NON-NLS-1$ |
|
|
|
.getRawMode(0)), |
|
|
|
(objectId == null) ? "null" //$NON-NLS-1$ |
|
|
|
: objectId.name(), treeWalk |
|
|
|
.getPathString(), repo |
|
|
|
.getIndexFile()))); |
|
|
|
} |
|
|
|
} |
|
|
|
JGitText.get().corruptObjectInvalidMode3, |
|
|
|
String.format("%o", //$NON-NLS-1$ |
|
|
|
Integer.valueOf(treeWalk.getRawMode(0))), |
|
|
|
(objectId == null) ? "null" : objectId.name(), //$NON-NLS-1$ |
|
|
|
treeWalk.getPathString(), // |
|
|
|
repo.getIndexFile())); |
|
|
|
} |
|
|
|
} |
|
|
|
return ret; |
|
|
|
} finally { |
|
|
|
if (revWalk != null) |
|
|
@@ -703,7 +702,6 @@ public class GC { |
|
|
|
} |
|
|
|
|
|
|
|
// write the packindex |
|
|
|
@SuppressWarnings("resource") |
|
|
|
FileChannel idxChannel = new FileOutputStream(tmpIdx).getChannel(); |
|
|
|
OutputStream idxStream = Channels.newOutputStream(idxChannel); |
|
|
|
try { |