]> source.dussan.org Git - jgit.git/commitdiff
FS_POSIX: Externalize log message 98/137498/2
authorDavid Pursehouse <david.pursehouse@gmail.com>
Sun, 24 Feb 2019 23:24:19 +0000 (08:24 +0900)
committerDavid Pursehouse <david.pursehouse@gmail.com>
Mon, 25 Feb 2019 02:05:42 +0000 (11:05 +0900)
Change-Id: Ida538e05c4595fdce99f1fa87469a3be60160adb
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
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/util/FS_POSIX.java

index 1366031be011f80e7e0d66e4bff56bb800341350..383e4c290bc16cccfbee80271c5423425d35b399 100644 (file)
@@ -735,6 +735,7 @@ unexpectedEndOfConfigFile=Unexpected end of config file
 unexpectedEndOfInput=Unexpected end of input
 unexpectedEofInPack=Unexpected EOF in partially created pack
 unexpectedHunkTrailer=Unexpected hunk trailer
+unexpectedNlinkValue=nlink of link to lock file {0} was not 2 but {1}
 unexpectedOddResult=odd: {0} + {1} - {2}
 unexpectedPacketLine=unexpected {0}
 unexpectedRefReport={0}: unexpected ref report: {1}
index 7dce43a71c803ccc41031fd585709ef023794e5e..e30fa080e6536210c90460d0a5044e3505db21eb 100644 (file)
@@ -795,6 +795,7 @@ public class JGitText extends TranslationBundle {
        /***/ public String unexpectedEndOfInput;
        /***/ public String unexpectedEofInPack;
        /***/ public String unexpectedHunkTrailer;
+       /***/ public String unexpectedNlinkValue;
        /***/ public String unexpectedOddResult;
        /***/ public String unexpectedPacketLine;
        /***/ public String unexpectedRefReport;
index 0e1e60f275ce0680479d1eb2b1acc25460d227ca..d8298cc6d5eb994ceabdadec421a1f30e760f8a7 100644 (file)
@@ -400,8 +400,9 @@ 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 {} was not 2 but {}", //$NON-NLS-1$
-                                               lock.getPath(), nlink);
+                               LOG.warn(MessageFormat.format(
+                                               JGitText.get().unexpectedNlinkValue, lock.getPath(),
+                                               nlink));
                                return false;
                        } else if (nlink < 2) {
                                supportsUnixNLink = false;