aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.test
diff options
context:
space:
mode:
authorThomas Wolf <twolf@apache.org>2022-08-14 16:34:50 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2022-08-14 21:33:19 +0200
commitb255eb0fb6ab9c7487423083e8df9b1e373bc37e (patch)
tree085ffc3bb03717ad7c91b16296d485685789822e /org.eclipse.jgit.test
parent134ee334fb22410623972fa972f60bff38b38ca8 (diff)
downloadjgit-b255eb0fb6ab9c7487423083e8df9b1e373bc37e.tar.gz
jgit-b255eb0fb6ab9c7487423083e8df9b1e373bc37e.zip
DirCacheCheckout: load WorkingTreeOptions only once
Previous code loaded the WorkingTreeOptions afresh for every single file being checked out. This checked the git config (all three files, repo, user and system config) for having been modified every time. These checks can be costly, for instance on Windows, or if one of the three config files is not on a local disk, or on an otherwise slow storage. Improve this by loading the options and thus checking the git config only once before the checkout. Bug: 579715 Change-Id: I21cd5a808f9d90b5ca2d022f91f0eeb8ca26091c Signed-off-by: Thomas Wolf <twolf@apache.org>
Diffstat (limited to 'org.eclipse.jgit.test')
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
index 0d49cd3396..e463e9070a 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java
@@ -303,12 +303,16 @@ public class FileTreeIteratorTest extends RepositoryTestCase {
DirCacheEntry dce = db.readDirCache().getEntry("symlink");
dce.setFileMode(FileMode.SYMLINK);
try (ObjectReader objectReader = db.newObjectReader()) {
- DirCacheCheckout.checkoutEntry(db, dce, objectReader, false, null);
+ WorkingTreeOptions options = db.getConfig()
+ .get(WorkingTreeOptions.KEY);
+ DirCacheCheckout.checkoutEntry(db, dce, objectReader, false, null,
+ options);
FileTreeIterator fti = new FileTreeIterator(trash, db.getFS(),
- db.getConfig().get(WorkingTreeOptions.KEY));
- while (!fti.getEntryPathString().equals("symlink"))
+ options);
+ while (!fti.getEntryPathString().equals("symlink")) {
fti.next(1);
+ }
assertFalse(fti.isModified(dce, false, objectReader));
}
}