From e6d9ae058b0d42c763b3c01374d7284e23a451c7 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Tue, 18 Jul 2017 19:30:07 -0700 Subject: [PATCH] dfs: only create DfsPackFile if description has PACK In the future with reftable a DFS implementation may choose to create a PackDescription that contains only a REFTABLE extension. Filter these out by only creating a DfsPackFile if the PackDescription as the expected PackExt.PACK. Change-Id: I4c831622378156ae6b68f82c1ee1db5e150893be --- .../eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java index 891d9af2e..76189c161 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java +++ b/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 reuseMap(PackList old) { - Map forReuse - = new HashMap<>(); + Map forReuse = new HashMap<>(); for (DfsPackFile p : old.packs) { if (p.invalid()) { // The pack instance is corrupted, and cannot be safely used