motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-4.10' into stable-4.11 

* stable-4.10:
  Fix GC to delete empty fanout directories after repacking

Change-Id: I7118b9c668dcbb0f5435cc613e964c557bfebf01
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
Matthias Sohn 2019-03-21 15:35:18 +01:00
parent 6a30ffd033 f06de6b575
commit 1a289e3420
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java
View File

@ -47,6 +47,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.Collections;
import java.util.Date;
@ -113,8 +114,24 @@ public void testPackCommitsAndLooseOneWithPruneNow() throws Exception {
fsTick();
gc.gc();
stats = gc.getStatistics();
assertNoEmptyFanoutDirectories();
assertEquals(0, stats.numberOfLooseObjects);
assertEquals(8, stats.numberOfPackedObjects);
assertEquals(2, stats.numberOfPackFiles);
}
private void assertNoEmptyFanoutDirectories() {
File[] fanout = repo.getObjectsDirectory().listFiles();
for (File f : fanout) {
if (f.isDirectory()) {
String[] entries = f.list();
if (entries == null || entries.length == 0) {
assertFalse(
"Found empty fanout directory "
+ f.getAbsolutePath() + " after pruning",
f.getName().length() == 2);
}
}
}
}
}

7
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
View File

@ -548,9 +548,12 @@ public void prune(Set<ObjectId> objectsToKeep) throws IOException,
pm.update(1);
if (d.length() != 2)
continue;
File[] entries = new File(objects, d).listFiles();
if (entries == null)
File dir = new File(objects, d);
File[] entries = dir.listFiles();
if (entries == null || entries.length == 0) {
FileUtils.delete(dir, FileUtils.IGNORE_ERRORS);
continue;
}
for (File f : entries) {
checkCancelled();
String fName = f.getName();