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:
commit
4451f466e0
|
@ -43,6 +43,7 @@
|
||||||
import org.eclipse.jgit.revwalk.RevCommit;
|
import org.eclipse.jgit.revwalk.RevCommit;
|
||||||
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
import org.eclipse.jgit.storage.file.FileBasedConfig;
|
||||||
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
|
import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
|
||||||
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class GcConcurrentTest extends GcTestCase {
|
public class GcConcurrentTest extends GcTestCase {
|
||||||
|
@ -197,6 +198,7 @@ public void repackAndCheckBitmapUsage() throws Exception {
|
||||||
assertNotNull(getSinglePack(repository).getBitmapIndex());
|
assertNotNull(getSinglePack(repository).getBitmapIndex());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Ignore
|
||||||
@Test
|
@Test
|
||||||
public void testInterruptGc() throws Exception {
|
public void testInterruptGc() throws Exception {
|
||||||
FileBasedConfig c = repo.getConfig();
|
FileBasedConfig c = repo.getConfig();
|
||||||
|
|
Loading…
Reference in New Issue