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:54:28 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2022-11-16 09:54:28 +0100
commit7f36943d0ce31356b99db4a1fed76633dd2b516c (patch)
treeb82df27e40de7f72c35b8d3d0254875ac52a0c5a /org.eclipse.jgit/src/org/eclipse/jgit/lib
parentd01376106af8800017ac3c08d7c7ac1fd5ccc9ee (diff)
parentf1909615d3d351b6c0b956e25a4a224b6b999d90 (diff)
downloadjgit-7f36943d0ce31356b99db4a1fed76633dd2b516c.tar.gz
jgit-7f36943d0ce31356b99db4a1fed76633dd2b516c.zip
Merge branch 'stable-6.0' into stable-6.1
* stable-6.0: [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: I176419026c3f4fdd8ebd34c61468c1ec3482ff45
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 80d720ae41..649bcde25a 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
@@ -502,6 +502,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
*/