]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.11' into stable-5.0 50/128950/1
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 8 Sep 2018 09:06:28 +0000 (11:06 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 8 Sep 2018 09:09:27 +0000 (11:09 +0200)
commit155dd1c5be9248e9271f708b970e6868d0461558
tree8d166d2d16d89d79038ab7850a1fbaee54e536a5
parent0718d22cf4d3f2db0229bae0fde65b2e6df238c9
parent5a583ef39357bde7700882f6d6ad72a8f3af8603
Merge branch 'stable-4.11' into stable-5.0

* stable-4.11:
  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: Ifcc8bfab4fd05c18a08dd82588860dffd0e6d726
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogWriter.java
org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java