Undo translation of protocol string 'unpack error'
This string is part of the network protocol, and isn't meant to be translated into another language. Clients actually scan for the string "unpack error " off the wire and react magically to this information. If it were translated, they would instead have a protocol exception, which isn't very useful when there is already an error occurring. Change-Id: Ia5dc8d36ba65ad2552f683bb637e80b77a7d92f0 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
bc0359c42f
commit
1709800f27
|
@ -379,7 +379,6 @@ unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0".
|
|||
unknownRepositoryFormat=Unknown repository format
|
||||
unknownZlibError=Unknown zlib error.
|
||||
unmergedPath=Unmerged path: {0}
|
||||
unpackError=unpack error {0}
|
||||
unreadablePackIndex=Unreadable pack index: {0}
|
||||
unrecognizedRef=Unrecognized ref: {0}
|
||||
unsupportedCommand0=unsupported command 0
|
||||
|
|
|
@ -438,7 +438,6 @@ public static JGitText get() {
|
|||
/***/ public String unknownRepositoryFormat;
|
||||
/***/ public String unknownZlibError;
|
||||
/***/ public String unmergedPath;
|
||||
/***/ public String unpackError;
|
||||
/***/ public String unreadablePackIndex;
|
||||
/***/ public String unrecognizedRef;
|
||||
/***/ public String unsupportedCommand0;
|
||||
|
|
|
@ -1048,7 +1048,7 @@ private List<ReceiveCommand> filterCommands(final Result want) {
|
|||
private void sendStatusReport(final boolean forClient, final Reporter out)
|
||||
throws IOException {
|
||||
if (unpackError != null) {
|
||||
out.sendString(MessageFormat.format(JGitText.get().unpackError, unpackError.getMessage()));
|
||||
out.sendString("unpack error " + unpackError.getMessage());
|
||||
if (forClient) {
|
||||
for (final ReceiveCommand cmd : commands) {
|
||||
out.sendString("ng " + cmd.getRefName()
|
||||
|
|
Loading…
Reference in New Issue