tree db9869ed686c719ac8b004708b42c9442e136828
parent b270e4b740a3b974bd5029fae224edc8ec088025
parent 06e06fc291a8ccc0e68b7d84b54097a9635df740
author Matthias Sohn <matthias.sohn@sap.com> 1536383953 +0200
committer Matthias Sohn <matthias.sohn@sap.com> 1536389892 +0200

Merge branch 'stable-4.7' into stable-4.8

* stable-4.7:
  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: Ia7a18f69eee173aec9e462c16eee2b0ca4565e76
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>