From 4169a95a65683e39e7a6a8f2b11b543e2bc754db Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Tue, 26 Feb 2019 11:53:49 +0100 Subject: [PATCH] Remove duplicate externalized message Instead of a new "unexpectedNlinkValue" message use the already existing "failedAtomicFileCreation". Remove a stray double quote from the latter. Change-Id: I1ba5e9ea48d3f7615354b2ace2575883070b3206 Signed-off-by: Thomas Wolf --- .../resources/org/eclipse/jgit/internal/JGitText.properties | 3 +-- org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 1 - org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index da8e32026..3c9705290 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -302,7 +302,7 @@ expectedLessThanGot=expected less than ''{0}'', got ''{1}'' expectedPktLineWithService=expected pkt-line with ''# service=-'', got ''{0}'' expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1} expectedReportForRefNotReceived={0}: expected report for ref {1} not received -failedAtomicFileCreation=Atomic file creation failed, number of hard links to file {0} was not 2 but {1}" +failedAtomicFileCreation=Atomic file creation failed, number of hard links to file {0} was not 2 but {1} failedToDetermineFilterDefinition=An exception occurred while determining filter definitions failedUpdatingRefs=failed updating refs failureDueToOneOfTheFollowing=Failure due to one of the following: @@ -735,7 +735,6 @@ 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} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index dc7991469..99550e74e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -795,7 +795,6 @@ public static JGitText get() { /***/ public String unexpectedEndOfInput; /***/ public String unexpectedEofInPack; /***/ public String unexpectedHunkTrailer; - /***/ public String unexpectedNlinkValue; /***/ public String unexpectedOddResult; /***/ public String unexpectedPacketLine; /***/ public String unexpectedRefReport; 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 d8298cc6d..716711e06 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 @@ -401,7 +401,7 @@ public boolean createNewFile(File lock) throws IOException { "unix:nlink")); //$NON-NLS-1$ if (nlink > 2) { LOG.warn(MessageFormat.format( - JGitText.get().unexpectedNlinkValue, lock.getPath(), + JGitText.get().failedAtomicFileCreation, lockPath, nlink)); return false; } else if (nlink < 2) {