]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-6.4' 05/199405/1
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 13 Jan 2023 18:33:54 +0000 (19:33 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Fri, 13 Jan 2023 18:33:54 +0000 (19:33 +0100)
* stable-6.4:
  Cache trustFolderStat/trustPackedRefsStat value per-instance
  Refresh 'objects' dir and retry if a loose object is not found

Change-Id: Iea8038dfde29ab988501469f86ee829e578a2fe8

1  2 
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectory.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java

index 6be36208563ffb9e1b6d2de3b58e3edbfd51ca96,2bee58f1d779ebfedcc1d84990cff7aa019b94c1..e34167450dc077a47d961d193428b129bd498e00
@@@ -126,10 -121,9 +126,10 @@@ public class ObjectDirectory extends Fi
                File packDirectory = new File(objects, "pack"); //$NON-NLS-1$
                File preservedDirectory = new File(packDirectory, "preserved"); //$NON-NLS-1$
                alternatesFile = new File(objects, Constants.INFO_ALTERNATES);
-               loose = new LooseObjects(objects);
+               loose = new LooseObjects(config, objects);
                packed = new PackDirectory(config, packDirectory);
                preserved = new PackDirectory(config, preservedDirectory);
 +              fileCommitGraph = new FileCommitGraph(objects);
                this.fs = fs;
                this.shallowFile = shallowFile;