Browse Source

Merge branch 'stable-4.5'

* origin/stable-4.5:
  Fix one case of missing object

Change-Id: Ia6384f4be71086d5a0a8c42c7521220f57dfd086
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
stable-4.6
Matthias Sohn 8 years ago
parent
commit
5274da3c3c
  1. 11
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java

11
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java

@ -459,9 +459,14 @@ public class GC {
return; return;
// delete all candidates which have survived: these are unreferenced // delete all candidates which have survived: these are unreferenced
// loose objects // loose objects. Make a last check, though, to avoid deleting objects
for (File f : deletionCandidates.values()) // that could have been referenced while the candidates list was being
f.delete(); // built (by an incoming push, for example).
for (File f : deletionCandidates.values()) {
if (f.lastModified() < expireDate) {
f.delete();
}
}
repo.getObjectDatabase().close(); repo.getObjectDatabase().close();
} }

Loading…
Cancel
Save