aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2010-08-30 10:58:19 -0700
committerShawn O. Pearce <spearce@spearce.org>2010-08-30 10:58:25 -0700
commit1709800f277460a75d69c453e127c2d8ad40c945 (patch)
tree71607f74fc68e65e59d73793e8f4520d25d7597f /org.eclipse.jgit
parentbc0359c42fe74e0ea184b87913e5275ac3533f1d (diff)
downloadjgit-1709800f277460a75d69c453e127c2d8ad40c945.tar.gz
jgit-1709800f277460a75d69c453e127c2d8ad40c945.zip
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>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java1
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java2
3 files changed, 1 insertions, 3 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 0b97d68f09..0c3d0e5d87 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -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
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index d6b496783b..fc12e57135 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -438,7 +438,6 @@ public class JGitText extends TranslationBundle {
/***/ public String unknownRepositoryFormat;
/***/ public String unknownZlibError;
/***/ public String unmergedPath;
- /***/ public String unpackError;
/***/ public String unreadablePackIndex;
/***/ public String unrecognizedRef;
/***/ public String unsupportedCommand0;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 6b0a9b6cff..f77e8e6ee4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -1048,7 +1048,7 @@ public class ReceivePack {
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()