diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 19:14:35 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-10-06 19:28:51 +0200 |
commit | 1133faff8ca980b688e79a3fcadd1641ff6b3bcd (patch) | |
tree | a0248c0e3571dc98bd26533096ec83e9cbdfad86 /org.eclipse.jgit.pgm | |
parent | 569cf1856caf74274744619039fecc81f1856e62 (diff) | |
parent | 2078b23ceebc2a021941ab6f7a6e7f7fdb5e34d5 (diff) | |
download | jgit-1133faff8ca980b688e79a3fcadd1641ff6b3bcd.tar.gz jgit-1133faff8ca980b688e79a3fcadd1641ff6b3bcd.zip |
Merge branch 'stable-5.1'
* stable-5.1:
Prepare 5.1.3-SNAPSHOT builds
JGit v5.1.2.201810061102-r
Prepare 4.11.5-SNAPSHOT builds
JGit v4.11.4.201810060650-r
Fix configuration of maven-javadoc-plugin
Prepare 4.9.7-SNAPSHOT builds
JGit v4.9.6.201810051924-r
Prepare 4.7.6-SNAPSHOT builds
JGit v4.7.5.201810051826-r
BaseReceivePack: Validate incoming .gitmodules files
ObjectChecker: Report .gitmodules files found in the pack
SubmoduleAddCommand: Reject submodule URIs that look like cli options
Revert "Configure WindowCache settings to use in JGit CLI"
Change-Id: I833d30d6de75b097377872c000b2ef5a1b96cf89
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit.pgm')
-rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java index 5ed286baa9..ad10ec9e44 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java @@ -71,7 +71,6 @@ import org.eclipse.jgit.lib.RepositoryBuilder; import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.opt.CmdLineParser; import org.eclipse.jgit.pgm.opt.SubcommandHandler; -import org.eclipse.jgit.storage.file.WindowCacheConfig; import org.eclipse.jgit.transport.HttpTransport; import org.eclipse.jgit.transport.http.apache.HttpClientConnectionFactory; import org.eclipse.jgit.util.CachedAuthenticator; @@ -106,19 +105,10 @@ public class Main { private ExecutorService gcExecutor; - private static final int MB = 1024 * 1024; - /** * <p>Constructor for Main.</p> */ public Main() { - final WindowCacheConfig c = new WindowCacheConfig(); - c.setPackedGitMMAP(true); - c.setPackedGitWindowSize(8 * 1024); - c.setPackedGitLimit(10 * MB); - c.setDeltaBaseCacheLimit(10 * MB); - c.setStreamFileThreshold(50 * MB); - c.install(); HttpTransport.setConnectionFactory(new HttpClientConnectionFactory()); BuiltinLFS.register(); gcExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() { |