File tree Expand file tree Collapse file tree 1 file changed +5
-0
lines changed
jablib/src/test/java/org/jabref/logic/git/merge Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change 1717import org .jabref .model .database .BibDatabaseContext ;
1818
1919import org .eclipse .jgit .api .Git ;
20+ import org .eclipse .jgit .internal .storage .file .WindowCache ;
2021import org .eclipse .jgit .lib .ObjectId ;
2122import org .eclipse .jgit .lib .PersonIdent ;
2223import org .eclipse .jgit .lib .Ref ;
24+ import org .eclipse .jgit .lib .RepositoryCache ;
2325import org .eclipse .jgit .revwalk .RevCommit ;
26+ import org .eclipse .jgit .storage .file .WindowCacheConfig ;
2427import org .eclipse .jgit .transport .RefSpec ;
2528import org .eclipse .jgit .transport .URIish ;
2629import 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
You can’t perform that action at this time.
0 commit comments