aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/src/org/eclipse/jgit/lib
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2022-11-16 09:55:22 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2022-11-16 09:55:22 +0100
commitd588c2c9ad4c416f767737f01675f3e7c8b69b91 (patch)
treef877ce464df21bd86c31132f5415c20779cd829b /org.eclipse.jgit/src/org/eclipse/jgit/lib
parent34600e3ca23262ed67555d147fa46892b5a5e67b (diff)
parent7f36943d0ce31356b99db4a1fed76633dd2b516c (diff)
downloadjgit-d588c2c9ad4c416f767737f01675f3e7c8b69b91.tar.gz
jgit-d588c2c9ad4c416f767737f01675f3e7c8b69b91.zip
Merge branch 'stable-6.1' into stable-6.2
* stable-6.1: [benchmarks] Remove profiler configuration Add SHA1 benchmark [benchmarks] Set version of maven-compiler-plugin to 3.8.1 Fix running JMH benchmarks Add option to allow using JDK's SHA1 implementation Ignore IllegalStateException if JVM is already shutting down Change-Id: Ie433c46a01a0f33848d54ecf99b30a44ca01e286
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/lib')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
index 2342cad0d7..47a572b83a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@ -538,6 +538,13 @@ public final class ConfigConstants {
public static final String CONFIG_KEY_SUPPORTSATOMICFILECREATION = "supportsatomicfilecreation";
/**
+ * The "sha1Implementation" key in the "core" section
+ *
+ * @since 5.13.2
+ */
+ public static final String SHA1_IMPLEMENTATION = "sha1implementation";
+
+ /**
* The "noprefix" key in the "diff" section
* @since 3.0
*/