Merge branch 'stable-6.0' into stable-6.1

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

Change-Id: I9c622de39200c6ee248d600736dc5db477f6bf9f
This commit is contained in:
Matthias Sohn 2023-04-27 01:37:29 +02:00
commit 4451f466e0
1 changed files with 2 additions and 0 deletions

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();