diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-11 23:55:18 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-11-12 00:01:17 +0100 |
| commit | 0dfc30951b5753b3966051c70e5b1c3860fd9fc5 (patch) | |
| tree | 43f77d02536195ee7165d8b55eff931362586d35 /org.eclipse.jgit | |
| parent | 7c889ac7ecb7e04010016d5a3c1e381235c3430b (diff) | |
| parent | 102733833c29ff84c093d54dc0554a1f73f89078 (diff) | |
| download | jgit-0dfc30951b5753b3966051c70e5b1c3860fd9fc5.tar.gz jgit-0dfc30951b5753b3966051c70e5b1c3860fd9fc5.zip | |
Merge branch 'stable-7.0'
* stable-7.0:
Replace custom encoder Constants#encodeASCII by JDK implementation
Replace custom encoder `Constants#encode` by JDK implementation
Add `numberOfPackFilesAfterBitmap` to RepoStatistics
Enhance CommitBuilder#parent to tolerate null parent
Change-Id: I46f961144f2e3c4c57ef0f63a9c8954fee8133e9
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index d8eb751136..3df291f11b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1509,7 +1509,7 @@ public class GC { public long numberOfPackFiles; /** - * The number of pack files that were created after the last bitmap + * The number of pack files that were created since the last bitmap * generation. */ public long numberOfPackFilesSinceBitmap; @@ -1575,10 +1575,11 @@ public class GC { ret.numberOfPackedObjects += p.getIndex().getObjectCount(); ret.numberOfPackFiles++; ret.sizeOfPackedObjects += p.getPackFile().length(); - if (p.getBitmapIndex() != null) + if (p.getBitmapIndex() != null) { ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); - else + } else { ret.numberOfPackFilesSinceBitmap++; + } } File objDir = repo.getObjectsDirectory(); String[] fanout = objDir.list(); |