motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge branch 'stable-5.13' into stable-6.0 

* stable-5.13:
  GcConcurrentTest: @Ignore flaky testInterruptGc
  Fix CommitTemplateConfigTest

Adapt GcConcurrentTest to changed FileRepositoryBuilder API.

Change-Id: I8906662a6391ceed20ab29cfbe238daf13e1be63
This commit is contained in:
Matthias Sohn 2023-04-27 01:07:47 +02:00
parent 9445e42b7a 2fd050c567
commit 74a13c7712
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcConcurrentTest.java
View File

@ -43,6 +43,7 @@
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.storage.file.FileBasedConfig;
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
import org.junit.Ignore;
import org.junit.Test;
public class GcConcurrentTest extends GcTestCase {
@ -197,6 +198,7 @@ public void repackAndCheckBitmapUsage() throws Exception {
assertNotNull(getSinglePack(repository).getBitmapIndex());
}
@Ignore
@Test
public void testInterruptGc() throws Exception {
FileBasedConfig c = repo.getConfig();