summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2018-08-17 01:24:10 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2018-08-17 01:24:10 +0200
commit7a536cef062eb81ee744f93675844bf7ce7f4581 (patch)
tree962cf1907e997be7f821ebfe8decd4ba314a4a1e /org.eclipse.jgit
parent63a3e415e78191d4aea96262467d630d4e64492c (diff)
parent982be5db14f98765486e3f3a59ce4e44b881f296 (diff)
downloadjgit-7a536cef062eb81ee744f93675844bf7ce7f4581.tar.gz
jgit-7a536cef062eb81ee744f93675844bf7ce7f4581.zip
Merge branch 'stable-5.0'
* stable-5.0: Fix wrong warning message in case of lock failures Change-Id: Ia9b813652a2f5b6c78e9587367c35c3a6c177a7a
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
index a2923db9dd..3abf4dc5e5 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java
@@ -389,7 +389,7 @@ public class FS_POSIX extends FS {
Integer nlink = (Integer) (Files.getAttribute(lockPath,
"unix:nlink")); //$NON-NLS-1$
if (nlink != 2) {
- LOG.warn("nlink of link to lock file {0} was not 2 but {1}", //$NON-NLS-1$
+ LOG.warn("nlink of link to lock file {} was not 2 but {}", //$NON-NLS-1$
lock.getPath(), nlink);
return false;
}