Browse Source

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>
tags/v5.3.0.201903061415-rc1
Thomas Wolf 5 years ago
parent
commit
4169a95a65

+ 1
- 2
org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties View File

expectedPktLineWithService=expected pkt-line with ''# service=-'', got ''{0}'' expectedPktLineWithService=expected pkt-line with ''# service=-'', got ''{0}''
expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1} expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1}
expectedReportForRefNotReceived={0}: expected report for ref {1} not received 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 failedToDetermineFilterDefinition=An exception occurred while determining filter definitions
failedUpdatingRefs=failed updating refs failedUpdatingRefs=failed updating refs
failureDueToOneOfTheFollowing=Failure due to one of the following: failureDueToOneOfTheFollowing=Failure due to one of the following:
unexpectedEndOfInput=Unexpected end of input unexpectedEndOfInput=Unexpected end of input
unexpectedEofInPack=Unexpected EOF in partially created pack unexpectedEofInPack=Unexpected EOF in partially created pack
unexpectedHunkTrailer=Unexpected hunk trailer unexpectedHunkTrailer=Unexpected hunk trailer
unexpectedNlinkValue=nlink of link to lock file {0} was not 2 but {1}
unexpectedOddResult=odd: {0} + {1} - {2} unexpectedOddResult=odd: {0} + {1} - {2}
unexpectedPacketLine=unexpected {0} unexpectedPacketLine=unexpected {0}
unexpectedRefReport={0}: unexpected ref report: {1} unexpectedRefReport={0}: unexpected ref report: {1}

+ 0
- 1
org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java View File

/***/ public String unexpectedEndOfInput; /***/ public String unexpectedEndOfInput;
/***/ public String unexpectedEofInPack; /***/ public String unexpectedEofInPack;
/***/ public String unexpectedHunkTrailer; /***/ public String unexpectedHunkTrailer;
/***/ public String unexpectedNlinkValue;
/***/ public String unexpectedOddResult; /***/ public String unexpectedOddResult;
/***/ public String unexpectedPacketLine; /***/ public String unexpectedPacketLine;
/***/ public String unexpectedRefReport; /***/ public String unexpectedRefReport;

+ 1
- 1
org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java View File

"unix:nlink")); //$NON-NLS-1$ "unix:nlink")); //$NON-NLS-1$
if (nlink > 2) { if (nlink > 2) {
LOG.warn(MessageFormat.format( LOG.warn(MessageFormat.format(
JGitText.get().unexpectedNlinkValue, lock.getPath(),
JGitText.get().failedAtomicFileCreation, lockPath,
nlink)); nlink));
return false; return false;
} else if (nlink < 2) { } else if (nlink < 2) {

Loading…
Cancel
Save