Skip to content

Commit 4fd2ed0

Browse files
authored
fix: prevent Windows tempdir deletion failure (#14102)
* fix: prevent Windows tempdir deletion failure * fix: reformat
1 parent 380729f commit 4fd2ed0

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

jablib/src/test/java/org/jabref/logic/git/merge/MergeBookkeeperTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717
import org.jabref.model.database.BibDatabaseContext;
1818

1919
import org.eclipse.jgit.api.Git;
20+
import org.eclipse.jgit.internal.storage.file.WindowCache;
2021
import org.eclipse.jgit.lib.ObjectId;
2122
import org.eclipse.jgit.lib.PersonIdent;
2223
import org.eclipse.jgit.lib.Ref;
24+
import org.eclipse.jgit.lib.RepositoryCache;
2325
import org.eclipse.jgit.revwalk.RevCommit;
26+
import org.eclipse.jgit.storage.file.WindowCacheConfig;
2427
import org.eclipse.jgit.transport.RefSpec;
2528
import org.eclipse.jgit.transport.URIish;
2629
import org.eclipse.jgit.util.SystemReader;
@@ -107,6 +110,8 @@ void tearDown() {
107110
if (remoteGit != null) {
108111
remoteGit.close();
109112
}
113+
RepositoryCache.clear();
114+
WindowCache.reconfigure(new WindowCacheConfig());
110115
}
111116

112117
// Scene 1: BEHIND + content equals the remote -> fast-forward

0 commit comments

Comments
 (0)