Merge branch 'stable-5.0' into stable-5.1

* stable-5.0:
  Fix atomic lock file creation on NFS
  Use constant for ".lock"
  Fix handling of option core.supportsAtomicCreateNewFile
  GC: Avoid logging errors when deleting non-empty folders

Change-Id: I3c8892e33516bdcadd983e7ab668635b7fa3d4c5
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --cc org.eclipse.jgit/.settings/.api_filters
index 9f4b761495602690e17337dd1b5f877e165b8622,803a29a5ec6c63d9b2a3cc826c7f75fe44353a7d..08fa8b3b59028e39a1deb38d424871ad98dcafee
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,17 -1,29 +1,29 @@@
  <?xml version="1.0" encoding="UTF-8" standalone="no"?>
  <component id="org.eclipse.jgit" version="2">
-     <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
-         <filter id="337768515">
+     <resource path="META-INF/MANIFEST.MF">
+         <filter id="924844039">
              <message_arguments>
-                 <message_argument value="org.eclipse.jgit.lib.ConfigConstants"/>
 -                <message_argument value="5.0.3"/>
 -                <message_argument value="5.0.0"/>
++                <message_argument value="5.1.0"/>
++                <message_argument value="5.1.0"/>
              </message_arguments>
          </filter>
      </resource>
-     <resource path="src/org/eclipse/jgit/transport/GitProtocolConstants.java" type="org.eclipse.jgit.transport.GitProtocolConstants">
-         <filter id="337768515">
+     <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS">
+         <filter id="1141899266">
              <message_arguments>
-                 <message_argument value="org.eclipse.jgit.transport.GitProtocolConstants"/>
+                 <message_argument value="4.7"/>
 -                <message_argument value="5.0"/>
++                <message_argument value="5.1"/>
+                 <message_argument value="createNewFileAtomic(File)"/>
              </message_arguments>
          </filter>
      </resource>
- </component>
+     <resource path="src/org/eclipse/jgit/util/FS.java" type="org.eclipse.jgit.util.FS$LockToken">
+         <filter id="1141899266">
+             <message_arguments>
+                 <message_argument value="4.7"/>
 -                <message_argument value="5.0"/>
++                <message_argument value="5.1"/>
+                 <message_argument value="LockToken"/>
+             </message_arguments>
+         </filter>
+     </resource>
+ </component>

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
Simple merge