summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.pgm.test
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2017-06-07 16:58:18 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2017-06-07 16:58:18 +0200
commit94c06009aafc7a61ae8a55699851a3e3ed27c19c (patch)
tree465491d0b9a7dcd468733d098dff2bfb86420dac /org.eclipse.jgit.pgm.test
parent5bfeec4fdbe72ec7f4dac252b98c8bad05898ef1 (diff)
parent6b1e3c58b16651dc72ec79a614d507e014d18393 (diff)
downloadjgit-94c06009aafc7a61ae8a55699851a3e3ed27c19c.tar.gz
jgit-94c06009aafc7a61ae8a55699851a3e3ed27c19c.zip
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7: Run auto GC in the background Change-Id: I5e25765f65d833f13cbe99696ef33055d7f5c4cf Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
-rw-r--r--org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java
index c43accdb6f..0ce645139d 100644
--- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java
+++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/ConfigTest.java
@@ -74,6 +74,7 @@ public class ConfigTest extends CLIRepositoryTestCase {
String[] output = execute("git config --list");
List<String> expect = new ArrayList<>();
+ expect.add("gc.autoDetach=false");
expect.add("core.filemode=" + !isWindows);
expect.add("core.logallrefupdates=true");
if (isMac)