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 <thomas.wolf@paranor.ch>

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 da8e32026bb2439806b3c34bedfbd61dd65ecd9e..3c9705290be02af5e779a238c3d61dde051fbeed 100644 (file)
--- 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 dc79914696b21acad857cf59fdaafadcd9f01873..99550e74e284a83f42864094adbfd0ca514a49b4 100644 (file)
--- 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 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;

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 d8298cc6d5eb994ceabdadec421a1f30e760f8a7..716711e067277187522002f7cb3259db0b8e0661 100644 (file)
--- 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 class FS_POSIX extends FS {
                                        "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) {