소스 검색

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>
tags/v4.6.0.201612231935-r
Matthias Sohn 7 년 전
부모
커밋
5274da3c3c
1개의 변경된 파일8개의 추가작업 그리고 3개의 파일을 삭제
  1. 8
    3
      org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java

+ 8
- 3
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java 파일 보기

@@ -459,9 +459,14 @@ public class GC {
return;

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

repo.getObjectDatabase().close();
}

Loading…
취소
저장