Browse Source

Merge "dfs: only create DfsPackFile if description has PACK"

stable-4.9
Shawn Pearce 7 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
0d4832e15b
  1. 5
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java

5
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java

@ -464,7 +464,7 @@ public abstract class DfsObjDatabase extends ObjectDatabase {
DfsPackFile oldPack = forReuse.remove(dsc);
if (oldPack != null) {
list.add(oldPack);
} else {
} else if (dsc.hasFileExt(PackExt.PACK)) {
list.add(new DfsPackFile(cache, dsc));
foundNew = true;
}
@ -482,8 +482,7 @@ public abstract class DfsObjDatabase extends ObjectDatabase {
}
private static Map<DfsPackDescription, DfsPackFile> reuseMap(PackList old) {
Map<DfsPackDescription, DfsPackFile> forReuse
= new HashMap<>();
Map<DfsPackDescription, DfsPackFile> forReuse = new HashMap<>();
for (DfsPackFile p : old.packs) {
if (p.invalid()) {
// The pack instance is corrupted, and cannot be safely used

Loading…
Cancel
Save