Merge "Remove duplicate externalized message"
This commit is contained in:
commit
20b633d95d
|
@ -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}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue